summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-09-03 17:20:21 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2019-08-05 14:54:49 +0200
commit2cd3d0bc6e8644b14b8f022d66f430e4dacf805f (patch)
treec5f4038b6bfaec2cf0b70aae18c838bd5e122078
parent3feff0f0f5796d7b7a70441fdd91302ba4bc5b98 (diff)
ofz#10198 reset uncommitted fly stuff & pams before applying redlining
Change-Id: I2a2587ec4590926f7cffc2a4d58a22d9d5f19c99 Reviewed-on: https://gerrit.libreoffice.org/59947 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins (cherry picked from commit 887ee9111f42847406c5ffc85a0ba635080de3de)
-rw-r--r--sw/source/filter/ww8/ww8par.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index b8bc89d44274..aa5f49804d72 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5417,6 +5417,9 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
UpdateFields();
+ DELETEZ(m_pWFlyPara);
+ DELETEZ(m_pSFlyPara);
+
// delete the pam before the call for hide all redlines (Bug 73683)
if (m_bNewDoc)
m_rDoc.getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)( eMode ));