sw/qa/core/data/ww6/pass/ofz-trailingpara.doc |binary
sw/source/filter/ww8/ww8par.cxx | 7 ++++---
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit e8cfba66f365e2ee6dd2e24790734328242a79f0
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Jan 24 15:52:30 2019 +0000
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Jan 25 09:33:24 2019 +0100
ofz#12660 remove flys before removing trailing paras
Change-Id: I6c706e5a2066b4fcd4546a22de0aa6327515a0a8
Reviewed-on: https://gerrit.libreoffice.org/66877
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 9b76295d03ee8d1eb19a62c55ff45804efe40f38)
Reviewed-on: https://gerrit.libreoffice.org/66886
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/qa/core/data/ww6/pass/ofz-trailingpara.doc
b/sw/qa/core/data/ww6/pass/ofz-trailingpara.doc
new file mode 100644
index 000000000000..40c574759b03
Binary files /dev/null and b/sw/qa/core/data/ww6/pass/ofz-trailingpara.doc
differ
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index b2a0302c0b44..edaf0463f326 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5311,13 +5311,14 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const
*pGloss)
DeleteAnchorStack();
DeleteRefStacks();
m_pLastAnchorPos.reset();//ensure this is deleted before UpdatePageDescs
+ // ofz#10994 remove any trailing fly paras before processing redlines
+ m_xWFlyPara.reset();
+ // ofz#12660 remove any trailing fly paras before deleting extra paras
+ m_xSFlyPara.reset();
// remove extra paragraphs after attribute ctrl
// 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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
