diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-08-17 09:15:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-08-17 12:44:42 +0200 |
| commit | b5870d727685ec10447e8ae446ada895250fec2e (patch) | |
| tree | 08fd9aebac7ed6ecdc7506cd2f9f2097a4a8986b /sw/source/filter/ww8 | |
| parent | 28708b5b7ad12bc30f02142c990e5ad4128af912 (diff) | |
Resolves: tdf#142003 tracked changes in footnotes offset in .doc import
Reverts:
commit e71d05eaa9a8c9e628b256f3e889b85ac11ed474
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Apr 27 15:42:26 2018 +0100
ofz#8038 defer subdocument redlining to end of parse like main document
Change-Id: Ie8d7a98c7927dcba53228ebcd991d715d8faabe7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120563
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 62631335a4ed..9c0862f5a9c6 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2067,7 +2067,6 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr ) pRdr->m_xCtrlStck = std::move(mxOldStck); pRdr->m_xRedlineStack->closeall(*pRdr->m_pPaM->GetPoint()); - pRdr->m_aFrameRedlines.emplace(std::move(pRdr->m_xRedlineStack)); pRdr->m_xRedlineStack = std::move(mxOldRedlines); pRdr->DeleteAnchorStack(); @@ -5333,8 +5332,6 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss) // are updated m_aExtraneousParas.delete_all_from_doc(); m_xRedlineStack->closeall(*m_pPaM->GetPoint()); - while (!m_aFrameRedlines.empty()) - m_aFrameRedlines.pop(); // For i120928,achieve the graphics from the special bookmark with is for graphic bullet { diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index dfd62872421d..5122e772e3ea 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1109,8 +1109,7 @@ private: This stack is for redlines, because their sequence of discovery can be out of order of their order of insertion into the document. */ - std::stack<std::unique_ptr<sw::util::RedlineStack>> m_aFrameRedlines; //inside frames, tables, etc - std::unique_ptr<sw::util::RedlineStack> m_xRedlineStack; //main document + std::unique_ptr<sw::util::RedlineStack> m_xRedlineStack; /* This stack is for fields that get referenced later, e.g. BookMarks and TOX. diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 163e9103a0b4..afa244ad5c87 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2755,7 +2755,6 @@ void WW8TabDesc::MoveOutsideTable() void WW8TabDesc::FinishSwTable() { m_pIo->m_xRedlineStack->closeall(*m_pIo->m_pPaM->GetPoint()); - m_pIo->m_aFrameRedlines.emplace(std::move(m_pIo->m_xRedlineStack)); m_pIo->m_xRedlineStack = std::move(mxOldRedlineStack); WW8DupProperties aDup(m_pIo->m_rDoc,m_pIo->m_xCtrlStck.get()); |