summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-09-03 17:20:21 +0100
committerAndras Timar <andras.timar@collabora.com>2021-05-10 16:33:52 +0200
commit6ed3876cfb520ec903e8055cb5690f38d0bc9e01 (patch)
tree926c30fb00834e42fc540860f590c25c34d2963e
parentf7c0b4519ecddef2430a6eb5f35296d1f2e04b1b (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 3aad6b8298fd..cd9ba231d788 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5394,6 +5394,9 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
UpdateFields();
+ m_xWFlyPara.reset();
+ m_xSFlyPara.reset();
+
// delete the pam before the call for hide all redlines (Bug 73683)
if (m_bNewDoc)
m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags(eMode);