diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-01-24 15:52:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-01-24 22:13:05 +0100 |
| commit | 9b76295d03ee8d1eb19a62c55ff45804efe40f38 (patch) | |
| tree | 7f753a0af79994dd75e39181821d5957cedad989 | |
| parent | c7e064e8a1ca7711cb541c8678ea2ffabd5af7d3 (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>
| -rw-r--r-- | sw/qa/core/data/ww6/pass/ofz-trailingpara.doc | bin | 0 -> 35109 bytes | |||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 7 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sw/qa/core/data/ww6/pass/ofz-trailingpara.doc b/sw/qa/core/data/ww6/pass/ofz-trailingpara.doc Binary files differnew file mode 100644 index 000000000000..40c574759b03 --- /dev/null +++ b/sw/qa/core/data/ww6/pass/ofz-trailingpara.doc diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 5b3010e90637..4732ef28c74d 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5317,13 +5317,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(); |