Kaydet (Commit) 8b0631fe authored tarafından Caolán McNamara's avatar Caolán McNamara

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: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 48d22544
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment