diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-03-24 13:04:54 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-03-24 16:38:39 +0100 |
| commit | 0d9132c5046e15540abc20e45d64080708626441 (patch) | |
| tree | b3d739dfd799abed6e96b30d327ac8cfe863859c /writerfilter | |
| parent | de0f33126d5dd92e2ea8b728dcb9dc7cd3b8995c (diff) | |
fdo#47036 fix RTF import of shapes inside text frames at the start of the doc
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c7b70de6bdd9..5daec329cc9c 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3233,6 +3233,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); @@ -3460,6 +3466,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: |