[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Libreoffice Gerrit user]

 sw/source/filter/ww8/ww8par.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 887ee9111f42847406c5ffc85a0ba635080de3de
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 3 17:20:21 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Sep 4 16:19:29 2018 +0200

    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 at cib.de>
    Tested-by: Jenkins

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);