mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix SwIndex assert on fdo66692-2.doc

Browse Source 
Change-Id: Ic3330817809727bfa2293ba74dcd7f5a25683dae
This commit is contained in:
Caolán McNamara
2015-10-14 16:54:47 +01:00
parent f0f6077dc5
commit 2d2d5d1a70
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sw/qa/core/data/ww8/pass/fdo66692-2.doc Normal file
View File

Binary file not shown.

15
sw/source/filter/ww8/ww8par6.cxx
View File

@@ -2511,6 +2511,21 @@ void SwWW8ImplReader::StopApo()
if (rBrush.GetColor().GetColor() != COL_AUTO)
aBg = rBrush.GetColor();
if (m_pLastAnchorPos.get())
{
//If the last anchor pos is here, then clear the anchor pos.
//This "last anchor pos" is only used for fixing up the
//postions of things anchored to page breaks and here
//we are removing the last paragraph of a frame, so there
//cannot be a page break at this point so we can
//safely reset m_pLastAnchorPos to avoid any dangling
//SwIndex's pointing into the deleted paragraph
SwNodeIndex aLastAnchorPos(m_pLastAnchorPos->nNode);
SwNodeIndex aToBeJoined(aPref, 1);
if (aLastAnchorPos == aToBeJoined)
m_pLastAnchorPos.reset();
}
//Get rid of extra empty paragraph
pNd->JoinNext();
}