diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2011-08-12 11:40:11 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2011-08-12 11:40:21 +0200 |
| commit | e0514fd4e88220c0dbbea87feea7a1275dfa2760 (patch) | |
| tree | 42bf85220f6c53ebf86c695d2bc463ba66773a5f /writerfilter | |
| parent | 7a01b7cba3c0f0a5748ed3e085c458cb7ea4796d (diff) | |
Picture frame: we need the destination text outside the pict group
I broke this in 6751324082ca472b9a34caabdd0a1032c27438b9
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 0f94caf56f6b..ea91f54692be 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2527,6 +2527,7 @@ int RTFDocumentImpl::popState() RTFSprms aSprms; RTFSprms aAttributes; + OUStringBuffer aDestinationText; bool bListEntryEnd = false; bool bListLevelEnd = false; bool bListOverrideEntryEnd = false; @@ -2677,6 +2678,7 @@ int RTFDocumentImpl::popState() { bPopPictureProperties = true; aAttributes = m_aStates.top().aCharacterAttributes; + aDestinationText = m_aStates.top().aDestinationText; } else if (m_aStates.top().nDestinationState == DESTINATION_SHAPETEXT) m_pCurrentBuffer = 0; // Just disable buffering, don't empty it yet. @@ -2901,7 +2903,10 @@ int RTFDocumentImpl::popState() else if (bFaltEnd) m_aStates.top().aTableSprms = aSprms; if (bPopPictureProperties) + { m_aStates.top().aCharacterAttributes = aAttributes; + m_aStates.top().aDestinationText = aDestinationText; + } if (m_pCurrentBuffer == &m_aSuperBuffer) { if (!m_bHasFootnote) |