diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-08-13 12:23:05 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-08-13 12:36:44 +0200 |
| commit | ad72a47dbd16f65316432df71dffe3b9b835fcc7 (patch) | |
| tree | f0fb19a68b96f9b5493aadef947e8f1dfc1dcc05 /writerfilter | |
| parent | 462907d48f18c8dab4f705203c840dee3253d268 (diff) | |
fdo#47495 fix RTF import of multiple shapes inside textframes
Change-Id: Iee8541ff9e88139648d45f08968476f2b1d4e1b3
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 2d66ed37b2d4..f27050a9915c 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3621,6 +3621,8 @@ int RTFDocumentImpl::popState() { m_aStates.top().resetFrame(); parBreak(); + // Save this state for later use, so we only reset frame status only for the first shape inside a frame. + aState = m_aStates.top(); m_bNeedPap = true; } break; @@ -3863,7 +3865,8 @@ int RTFDocumentImpl::popState() m_aStates.top().aCharacterAttributes = aState.aCharacterAttributes; } else if (aState.nDestinationState == DESTINATION_FLYMAINCONTENT || - aState.nDestinationState == DESTINATION_SHPPICT) + aState.nDestinationState == DESTINATION_SHPPICT || + aState.nDestinationState == DESTINATION_SHAPE) m_aStates.top().aFrame = aState.aFrame; if (m_pCurrentBuffer == &m_aSuperBuffer) { |