From e97a2073b5c8a209f224c70b04e9a1cddab30add Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 20 Jul 2018 12:28:54 +0100 Subject: forcepoint#51 anchor location deleted before graphic anchor processed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit try deferring to after anchor stack is cleared Change-Id: Iaa42d19635968d1656e171a7e0c5e473879cd8f3 Reviewed-on: https://gerrit.libreoffice.org/57772 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sw/source/filter/ww8/ww8par6.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sw/source/filter/ww8/ww8par6.cxx') diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index fbc3ecf271bb..7abf127ec0fd 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2526,6 +2526,7 @@ void SwWW8ImplReader::StopApo() Color aBg(0xFE, 0xFF, 0xFF, 0xFF); //Transparent by default SwTextNode* pNd = aPref.GetNode().GetTextNode(); + SwTextNode* pJoinNext = nullptr; if (pNd && m_xSFlyPara->pFlyFormat) { /* @@ -2555,13 +2556,16 @@ void SwWW8ImplReader::StopApo() } //Get rid of extra empty paragraph - pNd->JoinNext(); + pJoinNext = pNd; } if (m_xSFlyPara->pFlyFormat) m_xSFlyPara->pFlyFormat->SetFormatAttr(SvxBrushItem(aBg, RES_BACKGROUND)); DeleteAnchorStack(); + if (pJoinNext) + pJoinNext->JoinNext(); + m_xAnchorStck = std::move(m_xSFlyPara->xOldAnchorStck); // When inserting a graphic into the fly frame using the auto -- cgit