diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-06-05 10:59:23 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-07 14:07:24 +0200 |
commit | 66b4e7ee179cba8ec2f1229ebc6eb48343fae72a (patch) | |
tree | 95661090a2bf199f34b00401b6feb98943c42c95 | |
parent | 63e1546668ac464d1ba0b02ba5e76fb064e63100 (diff) |
tdf#117940 setting resize shape while text edit active not recorded in undo
Change-Id: I0887a1caea96f3efe897c304cde0520d59da6c59
Reviewed-on: https://gerrit.libreoffice.org/55326
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 55fdadcd68ac..7b9784b42c1a 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1645,6 +1645,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_TEXTATTR_DLG: { + if (mpDrawView->IsTextEdit()) + mpDrawView->SdrEndTextEdit(); SetCurrentFunction( FuTextAttrDlg::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) ); Cancel(); rReq.Ignore (); |