[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[László Németh (via logerrit)]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d4550d1ebed19d1e767113a5c5d98bc718bce57c
Author:     László Németh <nemeth at numbertext.org>
AuthorDate: Tue Apr 21 10:30:41 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Apr 22 13:28:09 2020 +0200

    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 at numbertext.org>
    (cherry picked from commit cfac976e27f310014dcd866000c874014fd6b173)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92531
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 727311ec7d09..81fcb49151d6 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3838,7 +3838,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;
@@ -3942,7 +3942,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;
 }