[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source

[Noel Power]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 577f1a54efe800c0e45bb64d78e2d9f6e489c2c6
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Jul 27 21:20:34 2012 +0200

    fdo#48033 fix RTF import of pictures inside table cells
    
    Change-Id: I2d9ef3b346d4b10b99b67d0934d63d59f6119f97

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 08fef7a..a59c06d 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;
 }