summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-01-12 20:02:29 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-01-14 10:04:11 +0000
commitb25967266ec1dfa3662783ddc58a4b0c3c9ba953 (patch)
tree403f764cf3dc0b6686557f75384c4c1b8eb65b1e
parentc5e31cdf8d81f2d03077ee962e76513c3858aa3d (diff)
sw: fdo#88005: fix check in SwWW8ImplReader::StopApo()
404f16e97f1c2fcd8f9a1297bdfa46cba970467e is embarrassing crap; the real problem there is that the paragraph that should be removed is _inside_ the frame, but in sf_68e4f217c107f6eada21adfe6e3c9c57-82055-minimized.doc the MoveInsideFly() is not called so a non-empty body paragraph was removed. Change-Id: I5d4443804c52a5fa30ddb51609ccbbee07abc5aa (cherry picked from commit e71668c4e642cc497206bfbe7191f64bddf31db0) Reviewed-on: https://gerrit.libreoffice.org/13885 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 9b6b7c4e74ed..3ef71bcdf0af 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2476,8 +2476,7 @@ void SwWW8ImplReader::StopApo()
Color aBg(0xFE, 0xFF, 0xFF, 0xFF); //Transparent by default
SwTxtNode* pNd = aPref.GetNode().GetTxtNode();
- if (pNd && &pPaM->GetPoint()->nNode.GetNode()
- != &pSFlyPara->pMainTextPos->nNode.GetNode())
+ if (pNd && pSFlyPara->pFlyFmt)
{
/*
#i582#