Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/1618 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/18/1618/1 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 --- M writerfilter/source/rtftok/rtfdocumentimpl.cxx 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 5529703..a7677d1 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -785,15 +785,16 @@ 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; } -- To view, visit https://gerrit.libreoffice.org/1618 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied422751783a00983bd137d6151e0d58217ef76d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna <vmik...@suse.cz> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice