commit cfac976e27f310014dcd866000c874014fd6b173
author László Németh <nemeth@numbertext.org> Tue Apr 21 10:30:41 2020 +0200
committer László Németh <nemeth@numbertext.org> Tue Apr 21 13:29:26 2020 +0200
tree ab8a282b0d153d759a7b81913491266b60123c67
parent 71de470ef2e7bac21a59d6baad8d12d1cc181628

tdf#127109 Writer: fix Undo entry "Delete $1"

Regression from commit b69c518df68ce673b28d589da6626bd3d860f309
(tdf#54819 keep style & numbering at tracked deletion)

Change-Id: I3041cc5a70d00bea14d7be1c275bb7d2a22e768a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92614
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>

sw/source/core/doc/DocumentContentOperationsManager.cxx

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 1020a40..a099876 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3864,7 +3864,7 @@ bool DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
    // tdf#54819 current redlining needs also modification of paragraph style and
    // attributes added to the same grouped Undo
    if (m_rDoc.GetIDocumentUndoRedo().DoesGroupUndo())
        m_rDoc.GetIDocumentUndoRedo().StartUndo(SwUndoId::DELETE, nullptr);
        m_rDoc.GetIDocumentUndoRedo().StartUndo(SwUndoId::EMPTY, nullptr);

    auto & rDMA(*m_rDoc.getIDocumentMarkAccess());
    std::vector<std::unique_ptr<SwUndo>> MarkUndos;
@@ -3968,7 +3968,7 @@ bool DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
    }

    if (m_rDoc.GetIDocumentUndoRedo().DoesGroupUndo())
        m_rDoc.GetIDocumentUndoRedo().EndUndo(SwUndoId::DELETE, nullptr);
        m_rDoc.GetIDocumentUndoRedo().EndUndo(SwUndoId::EMPTY, nullptr);

    return true;
}