summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail.com>2021-08-07 19:45:04 -0800
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2021-08-10 13:38:08 +0200
commitc52e48d3d79c41fa3febbbd82f5ae69ff885b1e7 (patch)
treeb234ea64c0b8ade1562b8dc63d6695fd5a7071fe
parent0188896ffb39a40e9db02b7e1908e601565e98aa (diff)
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 <raykowj@gmail.com> (cherry picked from commit 18004b707d2cb92ab88923138d72c5ca1b03301c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120141 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 64919f64f5da1ac149b5a0e1079ea8fd2299c574) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120143 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx2
1 files changed, 2 insertions, 0 deletions
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);
}