summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-06-05 10:59:23 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-06-05 16:00:55 +0200
commit1c0e0646321e276c6be22a13a70e37fdf93430e1 (patch)
tree721f4f3097f9a8e4d4fab5f44eb008f24f41a571 /sd
parentff4144cff2faafd7ebd0268c1bc29e55ebf7971f (diff)
tdf#117940 setting resize shape while text edit active not recorded in undo
Change-Id: I0887a1caea96f3efe897c304cde0520d59da6c59 Reviewed-on: https://gerrit.libreoffice.org/55325 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/view/drviews2.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index e6b9b92604fa..c0d53ba92a55 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1657,6 +1657,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_TEXTATTR_DLG:
{
+ if (mpDrawView->IsTextEdit())
+ mpDrawView->SdrEndTextEdit();
SetCurrentFunction( FuTextAttrDlg::Create( this, GetActiveWindow(), mpDrawView.get(), GetDoc(), rReq ) );
Cancel();
rReq.Ignore ();