diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-16 09:57:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-16 13:11:30 +0200 |
| commit | 8b0631fe118acc458fe7f94a47ded3dcbf7019be (patch) | |
| tree | 4235d586f5e8bb45b31afc21b8a9be58159463ae /sw | |
| parent | 48d22544be09bf63ded8eb48d1f8252b456f7fd5 (diff) | |
ofz#10994 move the reset of trailing fly paras to before redline processing
Change-Id: I906c29848acc3917f76cb8c21e0bd581e0ded421
Reviewed-on: https://gerrit.libreoffice.org/61819
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 32638e8cd51e..3435ae2e7292 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5300,6 +5300,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(); @@ -5393,9 +5396,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); |