From 0705b9f75d31c433b9ff263a0f1af06035664219 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@suse.cz>
Date: Fri, 27 Jul 2012 21:20:34 +0200
Subject: fdo#48033 fix RTF import of pictures inside table cells

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

(limited to 'writerfilter')

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b63bc3c90724..b03a7bc5d415 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;
 }
-- 
cgit