diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-07-27 21:20:34 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-07-27 22:23:42 +0200 |
commit | 0705b9f75d31c433b9ff263a0f1af06035664219 (patch) | |
tree | e51c44ee90637e38d8c20ee4860872c133c3f0c0 /writerfilter | |
parent | d6c284e4b146a44ba69a96836c59a98d077bb934 (diff) |
fdo#48033 fix RTF import of pictures inside table cells
Change-Id: I2d9ef3b346d4b10b99b67d0934d63d59f6119f97
Diffstat (limited to 'writerfilter')
-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 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; } |