sw/source/filter/ww8/ww8par.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit fe6a98ed8fe863dd5a5aee5becb6e989c1f6a457 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Oct 16 09:57:36 2018 +0100 Commit: Adolfo Jayme Barrientos <[email protected]> CommitDate: Sat Oct 20 10:48:07 2018 +0200 ofz#10994 move the reset of trailing fly paras to before redline processing Change-Id: I906c29848acc3917f76cb8c21e0bd581e0ded421 Reviewed-on: https://gerrit.libreoffice.org/61821 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index e2a18452cf90..bcc16adc2d98 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5324,6 +5324,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(); @@ -5417,9 +5420,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 [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
