diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-01-09 15:29:29 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-09 15:57:00 +0100 |
commit | 555bc780c83114220012e198b5471a0d7452fb32 (patch) | |
tree | 0e71f7748bc032dcb57fc29c3f139947311ab6af /writerfilter | |
parent | 1ce372eec4dd0e4e807baa7bbf568245b955f99f (diff) |
fdo#58933 RTF import: avoid fake pars / cells when having graphic inside cells
Regression from 8063e36115a11ddf3db05928db9287947beee74d.
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index d7422a061cf2..4964791cf040 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -817,15 +817,16 @@ int RTFDocumentImpl::resolvePict(bool bInline) writerfilter::Reference<Properties>::Pointer_t const pProperties(new RTFReferenceProperties(aAttributes, aSprms)); checkFirstRun(); if (!m_pCurrentBuffer) + { Mapper().props(pProperties); + // Make sure we don't loose these properties with a too early reset. + m_bHadPicture = true; + } else { RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms)); m_pCurrentBuffer->push_back(make_pair(BUFFER_PROPS, pValue)); } - - // Make sure we don't loose these properties with a too early reset. - m_bHadPicture = true; return 0; } |