summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2019-06-30 19:37:24 +0200
committerMiklos Vajna <vmiklos@collabora.com>2019-07-01 09:45:10 +0200
commit091f573728e7951d5dc4ef138117499b7480885f (patch)
tree91601b5eba6ae0089f59964e5d016fc6d054faa8 /svx
parent40cb97b077af86b98da7ddd499a84748f53740f6 (diff)
tdf#125824 svx: fix crash with view1 and view2 doing textedit
Similar to 3a874f1c80c37e8b35666e1d73161ff762eb7e4c Change-Id: I51bffa4d33e82bb90b8a42787f55c12746bcd8c2 Reviewed-on: https://gerrit.libreoffice.org/74931 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdedxv.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index f4d3f8eee8aa..5163f943e8bb 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1475,7 +1475,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
pTEOutliner->SetBeginPasteOrDropHdl(Link<PasteOrDropInfos*,void>());
pTEOutliner->SetEndPasteOrDropHdl(Link<PasteOrDropInfos*,void>());
- const bool bUndo = IsUndoEnabled();
+ const bool bUndo = IsUndoEnabled() && CanDoSdrUndo();
if( bUndo )
{
OUString aObjName(pTEObj->TakeObjNameSingul());