diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-16 09:57:36 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2018-10-20 10:48:07 +0200 |
| commit | fe6a98ed8fe863dd5a5aee5becb6e989c1f6a457 (patch) | |
| tree | 01b792739c1c278463f3c45c52c6670943b36e8d /sw/source/filter/ww8/ww8par.cxx | |
| parent | 3ec5fb847364ca65322079fdc1026ed95a0a8933 (diff) | |
ofz#10994 move the reset of trailing fly paras to before redline processing
Change-Id: I906c29848acc3917f76cb8c21e0bd581e0ded421
Reviewed-on: https://gerrit.libreoffice.org/61821
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sw/source/filter/ww8/ww8par.cxx')
| -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 e2a18452cf90..bcc16adc2d98 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5324,6 +5324,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(); @@ -5417,9 +5420,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); |