sw/source/filter/ww8/ww8par.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8b0631fe118acc458fe7f94a47ded3dcbf7019be
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Oct 16 09:57:36 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Oct 16 13:11:30 2018 +0200
ofz#10994 move the reset of trailing fly paras to before redline processing
Change-Id: I906c29848acc3917f76cb8c21e0bd581e0ded421
Reviewed-on: https://gerrit.libreoffice.org/61819
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 32638e8cd51e..3435ae2e7292 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5300,6 +5300,9 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const
*pGloss)
// stacks etc. are destroyed, and before fields
// are updated
m_aExtraneousParas.delete_all_from_doc();
+ // ofz#10994 remove any trailing fly paras before processing redlines
+ m_xWFlyPara.reset();
+ m_xSFlyPara.reset();
m_xRedlineStack->closeall(*m_pPaM->GetPoint());
while (!m_aFrameRedlines.empty())
m_aFrameRedlines.pop();
@@ -5393,9 +5396,6 @@ 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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
