From 3e59fa4f3ba1408939e4f937cea29fa614f84b37 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sat, 24 Mar 2012 13:04:54 +0100 Subject: fdo#47036 fix RTF import of shapes inside text frames at the start of the doc --- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index aca451979100..16d5c754c804 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3266,6 +3266,12 @@ int RTFDocumentImpl::popState() Mapper().startShape(xShape); Mapper().endShape(); } + else if (m_aStates.top().nDestinationState == DESTINATION_SHAPE && m_aStates.top().aFrame.inFrame()) + { + m_aStates.top().resetFrame(); + parBreak(); + m_bNeedPap = true; + } // See if we need to end a track change RTFValue::Pointer_t pTrackchange = m_aStates.top().aCharacterSprms.find(NS_ooxml::LN_trackchange); @@ -3493,6 +3499,11 @@ RTFFrame::RTFFrame(RTFParserState* pParserState) void RTFFrame::setSprm(Id nId, Id nValue) { + if (m_pParserState->m_pDocumentImpl->getFirstRun()) + { + m_pParserState->m_pDocumentImpl->checkFirstRun(); + m_pParserState->m_pDocumentImpl->setNeedPar(false); + } switch (nId) { case NS_sprm::LN_PDxaWidth: -- cgit v1.2.3