sw/source/filter/ww8/ww8par.cxx | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 603f4ae4363d26c5e14534fe6b6c9328ba47b474
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jan 24 14:59:27 2018 +0000
ofz#5578 remove Extraneous Paras before applying redlines
Change-Id: Ibcc75de98f1d01f8617e34b3844b62e57142466e
Reviewed-on: https://gerrit.libreoffice.org/48515
Tested-by: Jenkins <c...@libreoffice.org>
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 1bfacdd4f79b..a84241e6c2df 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5303,6 +5303,10 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const
*pGloss)
DeleteCtrlStack();
m_pLastAnchorPos.reset();//ensure this is deleted before UpdatePageDescs
+ // remove extra paragraphs after attribute ctrl
+ // stacks etc. are destroyed, and before fields
+ // are updated
+ m_aExtraneousParas.delete_all_from_doc();
m_xRedlineStack->closeall(*m_pPaM->GetPoint());
m_xRedlineStack.reset();
DeleteAnchorStack();
@@ -5393,11 +5397,6 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const
*pGloss)
mpCursor.reset();
m_pPaM = nullptr;
- // remove extra paragraphs after attribute ctrl
- // stacks etc. are destroyed, and before fields
- // are updated
- m_aExtraneousParas.delete_all_from_doc();
-
UpdateFields();
// delete the pam before the call for hide all redlines (Bug 73683)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
