writerfilter/source/rtftok/rtfdocumentimpl.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
New commits: commit 32af6dec1b7b80759a793e5f1da0a1129823c51e Author: Miklos Vajna <[email protected]> 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 3fb9491..af2d592 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; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
