diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2019-06-30 19:37:24 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-07-02 15:43:08 +0200 |
commit | 9dca7c2fac5c6b83a6910aa61b1a2a316f36d948 (patch) | |
tree | 93be150b27791ae6d5d520891c1bf13e9d7a861f /svx | |
parent | 9ed060d38fd8dc85bebccbc735bce8bf66a89df4 (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>
(cherry picked from commit 091f573728e7951d5dc4ef138117499b7480885f)
Reviewed-on: https://gerrit.libreoffice.org/74949
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 0f7361bbd6d8..2af15dba79a3 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1454,7 +1454,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()); |