summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-08-14 16:50:16 +0200
committerPetr Mladek <pmladek@suse.cz>2012-08-14 17:07:46 +0200
commit53d64c71d3a4fcc6b238e946fd6883b8b4593bca (patch)
tree637aea233a02c68f47f97163ffa69c9596871b61
parent9f6ede5c0a998d2925b017b82ff73dd0a793a858 (diff)
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@suse.cz>
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 340922470568..79991ebbd79e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3439,8 +3439,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())
{
@@ -3464,6 +3463,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;
}