diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-07-27 21:20:34 +0200 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2012-07-31 11:45:28 +0100 |
| commit | 32af6dec1b7b80759a793e5f1da0a1129823c51e (patch) | |
| tree | e34ec419d33042da0a1c4eaeb60586d373ef1608 | |
| parent | 1f52bf67892a5ce61bcf90c350a462f638580eb7 (diff) | |
fdo#48033 fix RTF import of pictures inside table cells
Change-Id: I2d9ef3b346d4b10b99b67d0934d63d59f6119f97
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 3fb949187c17..af2d59284477 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -801,7 +801,13 @@ int RTFDocumentImpl::resolvePict(bool bInline) } writerfilter::Reference<Properties>::Pointer_t const pProperties(new RTFReferenceProperties(aAttributes, aSprms)); checkFirstRun(); - Mapper().props(pProperties); + if (!m_pCurrentBuffer) + Mapper().props(pProperties); + else + { + RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms)); + m_pCurrentBuffer->push_back(make_pair(BUFFER_PROPS, pValue)); + } return 0; } |