diff options
author | Miklos Vajna <vmiklos@frugalware.org> | 2011-08-18 01:01:57 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@frugalware.org> | 2011-08-18 01:01:57 +0200 |
commit | 2e67f17fb3aedb41edb72abf87b40bd5ab746296 (patch) | |
tree | 1a8b0140138bef83282b2d4f30ee97d82d97bc56 /writerfilter | |
parent | implement RTF_FLYVERT and RTF_FLYHORZ (diff) | |
download | core-2e67f17fb3aedb41edb72abf87b40bd5ab746296.tar.gz core-2e67f17fb3aedb41edb72abf87b40bd5ab746296.zip |
fly props are needed outside their destination
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index b99db4dafb68..abf2a87b2234 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2636,6 +2636,8 @@ int RTFDocumentImpl::popState() bool bPopShapeProperties = false; bool bPopPictureProperties = false; bool bFaltEnd = false; + RTFFrame aFrame; + bool bPopFrame = false; if (m_aStates.top().nDestinationState == DESTINATION_FONTTABLE) { @@ -2951,6 +2953,11 @@ int RTFDocumentImpl::popState() aSprms = m_aStates.top().aTableSprms; bFaltEnd = true; } + else if (m_aStates.top().nDestinationState == DESTINATION_FLYMAINCONTENT) + { + aFrame = m_aStates.top().aFrame; + bPopFrame = true; + } // See if we need to end a track change RTFValue::Pointer_t pTrackchange = m_aStates.top().aCharacterSprms.find(NS_ooxml::LN_trackchange); @@ -3004,6 +3011,8 @@ int RTFDocumentImpl::popState() } else if (bFaltEnd) m_aStates.top().aTableSprms = aSprms; + else if (bPopFrame) + m_aStates.top().aFrame = aFrame; if (bPopPictureProperties) { m_aStates.top().aPicture = aPicture; |