fdo#48033 fix RTF import of pictures inside table cells

Change-Id: I2d9ef3b346d4b10b99b67d0934d63d59f6119f97

1 files changed, 7 insertions, 1 deletions

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 08fef7a4d08f..a59c06db0b8f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -759,7 +759,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;
 }