diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-01-09 15:29:29 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-01-09 19:18:42 +0000 |
commit | 10a6a58e8d55f5d6c1ce7b6cba38f710b6edab6f (patch) | |
tree | 5863f7d8f6a0dccc9e010fd88b685abc858727c0 | |
parent | c695c0fdd15d70d26ac8f4a82dde515372df32c2 (diff) |
fdo#58933 RTF import: avoid fake pars / cells when having graphic inside cells
Regression from 8063e36115a11ddf3db05928db9287947beee74d.
(cherry picked from commit 555bc780c83114220012e198b5471a0d7452fb32)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: Ied422751783a00983bd137d6151e0d58217ef76d
Reviewed-on: https://gerrit.libreoffice.org/1618
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
-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 5529703cba29..a7677d1f3a50 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -785,15 +785,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; } |