diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-01-24 15:52:30 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-01-25 09:33:24 +0100 |
| commit | e8cfba66f365e2ee6dd2e24790734328242a79f0 (patch) | |
| tree | 11458e8688a79263ae900be2c58dd1f0ec65d896 /sw/source | |
| parent | cf185ecb5a3cd2f71a5fdf9960a05c521e489521 (diff) | |
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 9b76295d03ee8d1eb19a62c55ff45804efe40f38)
Reviewed-on: https://gerrit.libreoffice.org/66886
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
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(); |