diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-08-19 18:11:42 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-20 10:29:55 -0500 |
| commit | b2d54aa61607e477cb4b81f1a70e555ee3adb0af (patch) | |
| tree | 80daa777a958cf3accd249c42a57496904d12993 | |
| parent | 3b6748a4002f4b61ae477da7a84b4a0feccdef12 (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
(cherry picked from commit 404f16e97f1c2fcd8f9a1297bdfa46cba970467e)
Reviewed-on: https://gerrit.libreoffice.org/11046
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -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 5e7ce094156b..cb22c8f8111c 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2379,7 +2379,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 @@ -2475,7 +2475,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# |