sw/source/filter/ww8/ww8par6.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 953a77abf6466165d5fbcc88cd87ce062ad901e8
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Aug 19 18:11:42 2014 +0200
sw: ww8: fix another ~SwIndexReg() assertion
If the position is the same as the body text anchor position, don't
delete the node. Probably something should have inserted more nodes
between StartApo() and StopApo().
Change-Id: I41110a47d840e764f6d2a24e43bf6938b1282972
(cherry picked from commit 404f16e97f1c2fcd8f9a1297bdfa46cba970467e)
Reviewed-on: https://gerrit.libreoffice.org/11048
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 14cb5b3..392fdac 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2374,7 +2374,7 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
pAnchorStck->AddAnchor(*pPaM->GetPoint(),pSFlyPara->pFlyFmt);
}
- // merke Pos im Haupttext
+ // remember Pos in body text
pSFlyPara->pMainTextPos = new SwPosition( *pPaM->GetPoint() );
//remove fltanchors, otherwise they will be closed inside the
@@ -2470,7 +2470,9 @@ void SwWW8ImplReader::StopApo()
Color aBg(0xFE, 0xFF, 0xFF, 0xFF); //Transparent by default
- if (SwTxtNode* pNd = aPref.GetNode().GetTxtNode())
+ SwTxtNode* pNd = aPref.GetNode().GetTxtNode();
+ if (pNd && &pPaM->GetPoint()->nNode.GetNode()
+ != &pSFlyPara->pMainTextPos->nNode.GetNode())
{
/*
#i582#
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
