diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2011-08-19 16:06:27 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2011-08-19 17:20:02 +0200 |
| commit | 49f5d94f40fddae3d34a8f330965719f8f64eb04 (patch) | |
| tree | c13faa8ed9ff6c8c3082db00dfd2c36a92301556 /writerfilter | |
| parent | 8807969ef37ed9b4ff0d3f259802982e49b55805 (diff) | |
pictures in fly frames are already handled
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index e46c1b9442e7..e9d2efa1e139 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1032,6 +1032,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) m_aStates.top().nDestinationState = DESTINATION_LEVELNUMBERS; break; case RTF_SHPPICT: + m_aStates.top().aFrame = RTFFrame(); m_aStates.top().nDestinationState = DESTINATION_SHPPICT; break; case RTF_PICT: @@ -2992,7 +2993,8 @@ int RTFDocumentImpl::popState() aSprms = m_aStates.top().aTableSprms; bFaltEnd = true; } - else if (m_aStates.top().nDestinationState == DESTINATION_FLYMAINCONTENT) + else if (m_aStates.top().nDestinationState == DESTINATION_FLYMAINCONTENT + || m_aStates.top().nDestinationState == DESTINATION_SHPPICT) { aFrame = m_aStates.top().aFrame; bPopFrame = true; |