[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/ww8par.cxx  |    3 ---
 sw/source/filter/ww8/ww8par.hxx  |    3 +--
 sw/source/filter/ww8/ww8par2.cxx |    1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit b888acd3c9b37c831b65c5d8aff98026046b2595
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Aug 17 09:15:13 2021 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Aug 17 15:59:26 2021 +0200

    Resolves: tdf#142003 tracked changes in footnotes offset in .doc import
    
    Reverts:
    
    commit e71d05eaa9a8c9e628b256f3e889b85ac11ed474
    Author: Caolán McNamara <caol...@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 <caol...@redhat.com>
    (cherry picked from commit b5870d727685ec10447e8ae446ada895250fec2e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120581
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index d72f51d240f6..2caf356dc5d6 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2090,7 +2090,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();
@@ -5381,8 +5380,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 07beb3592bff..9626adf3767f 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1105,8 +1105,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 bf5a27528b6e..ad64bb616bd1 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2750,7 +2750,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());