diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2019-06-30 19:37:24 +0200 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-07-01 12:37:46 +0200 |
| commit | 1da42db5f3b8e382cc9ea3345a87e7ce495d44d9 (patch) | |
| tree | 49c07b9bf8f3e255ad12cf7627b902716bd2e4d7 /svx | |
| parent | 0988c406e9d849f6588fef3ff9ed5d2c404ef738 (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/74948
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
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 8935d2702804..cb9deae0ed19 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()); |