diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2021-08-07 19:45:04 -0800 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-08-09 15:28:35 +0200 |
| commit | 64919f64f5da1ac149b5a0e1079ea8fd2299c574 (patch) | |
| tree | 8e3439ba0af9a2cf80ec3c1b5bc24f6b71584723 /sd | |
| parent | ef5bbe7a52baded54e8e6351431f2e04ef2b6828 (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>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/sdtreelb.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 9d4d00eb07b1..6768fc2fe30b 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); } |