[Libreoffice-commits] .: Branch 'libreoffice-3-6-1' - writerfilter/source

[Petr Mladek]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 558f5af9feec7825f4edf5f7e4e6f7094fc1c094
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Tue Aug 14 16:50:16 2012 +0200

    Fix fdo#47495 backport
    
    On master, the fix was fine, but on -3-6 this broke the fdo#47036 unit
    test, fix this.
    
    Change-Id: I02449a41801646c7eb2408e60f9051e1269d6693
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index aa58eaa..c814b91 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3411,8 +3411,7 @@ int RTFDocumentImpl::popState()
         bFaltEnd = true;
     }
     else if (m_aStates.top().nDestinationState == DESTINATION_FLYMAINCONTENT
-            || m_aStates.top().nDestinationState == DESTINATION_SHPPICT
-            || aState.nDestinationState == DESTINATION_SHAPE)
+            || m_aStates.top().nDestinationState == DESTINATION_SHPPICT)
         bPopFrame = true;
     else if (m_aStates.top().nDestinationState == DESTINATION_DRAWINGOBJECT && m_aStates.top().aDrawingObject.xShape.is())
     {
@@ -3439,6 +3438,7 @@ int RTFDocumentImpl::popState()
         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();
+        bPopFrame = true;
         m_bNeedPap = true;
     }