diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-08-19 18:11:42 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-08-20 16:40:07 +0200 |
| commit | 404f16e97f1c2fcd8f9a1297bdfa46cba970467e (patch) | |
| tree | 573c3e434aa899f3b81bd74cc886520fa2fedd2b | |
| parent | be4320f32a4e5ca46a749a3f9ccc0ffb8e188dbf (diff) | |
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
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 69f8582a1c65..d25b5a24ad69 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2380,7 +2380,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 @@ -2476,7 +2476,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# |