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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Sep 30 11:16:46 UTC 2020


 sw/source/core/undo/unattr.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1162b94cfe81303012a04e45d6cf9d254cd2ed4c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 28 14:05:00 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Sep 30 13:16:12 2020 +0200

    tdf#133358 fix crash in redoing indent
    
    since...
    
    commit b070202b420129b5edd368420e0e50ec45261d01
    Date:   Tue Nov 20 18:26:18 2018 +0100
    
        sw_redlinehide_4a: SwEditShell::IsMoveLeftMargin(), MoveLeftMargin()
    
    Change-Id: Ie28207747560153020341305015f1693f6ca9f50
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103552
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit dc6e005c79b6c23b805dea44cd89fa83ea945f03)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103578
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit c1955f26cb772fc90ca81affcb524ebf1f12f3a3)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103649
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 038302aa187c..e0130d9390f3 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -919,14 +919,15 @@ void SwUndoMoveLeftMargin::RedoImpl(::sw::UndoRedoContext & rContext)
     SwPaM & rPam = AddUndoRedoPaM(rContext);
 
     rDoc.MoveLeftMargin( rPam,
-                         GetId() == SwUndoId::INC_LEFTMARGIN, m_bModulus );
+                         GetId() == SwUndoId::INC_LEFTMARGIN, m_bModulus,
+                         rDoc.getIDocumentLayoutAccess().GetCurrentLayout() );
 }
 
 void SwUndoMoveLeftMargin::RepeatImpl(::sw::RepeatContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
     rDoc.MoveLeftMargin(rContext.GetRepeatPaM(), GetId() == SwUndoId::INC_LEFTMARGIN,
-                        m_bModulus );
+                        m_bModulus, rDoc.getIDocumentLayoutAccess().GetCurrentLayout());
 }
 
 SwUndoChangeFootNote::SwUndoChangeFootNote(


More information about the Libreoffice-commits mailing list