[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-0' - sd/source

[Jim Raykowski (via logerrit)]

 sd/source/ui/dlg/sdtreelb.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c52e48d3d79c41fa3febbbd82f5ae69ff885b1e7
Author:     Jim Raykowski <rayk...@gmail.com>
AuthorDate: Sat Aug 7 19:45:04 2021 -0800
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Aug 10 13:38:08 2021 +0200

    tdf#143572 Restore enable undo setting immediatly after object name
    
    is set each time here
    
    This prevents a crash when an object is in text edit mode and a
    different object is selected in the navigator to jump to.
    
    Change-Id: I7c0eaa7770f0e3f23e6a62780f18e0a973019c62
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120170
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <rayk...@gmail.com>
    (cherry picked from commit 18004b707d2cb92ab88923138d72c5ca1b03301c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120141
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit 64919f64f5da1ac149b5a0e1079ea8fd2299c574)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120143
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 4494cf35419a..f146b30b6a80 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -711,7 +711,9 @@ void SdPageObjsTLV::Select()
                 const bool bUndo = 
pObject->getSdrModelFromSdrObject().IsUndoEnabled();
                 pObject->getSdrModelFromSdrObject().EnableUndo(false);
                 pObject->SetName(m_xTreeView->get_selected_text(), false);
+                pObject->getSdrModelFromSdrObject().EnableUndo(bUndo);
                 m_aRowActivatedHdl.Call(*m_xTreeView);
+                pObject->getSdrModelFromSdrObject().EnableUndo(false);
                 pObject->SetName(OUString(), false);
                 pObject->getSdrModelFromSdrObject().EnableUndo(bUndo);
             }