summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-09-03 17:20:21 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-09-04 16:19:29 +0200
commit887ee9111f42847406c5ffc85a0ba635080de3de (patch)
tree3cd69966d48fa8051c0aa514b63905bea72938ec /sw/source
parent8767161e056b5d7fc8cf168d0541db86635d1041 (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
Diffstat (limited to 'sw/source')
-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 0f2206c711b1..c4fd1cd33125 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5391,6 +5391,9 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *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);