sw/source/filter/ww8/ww8par6.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit 45722714be0abfb3ccb0b4dcbecaaaed98094343 Author: Michael Stahl <mst...@redhat.com> Date: Mon Jan 12 20:02:29 2015 +0100 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/13884 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index b46ec7d..758c292 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2477,8 +2477,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#
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits