diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-06-05 10:59:23 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-06-11 15:16:36 +0200 |
| commit | 92f0922f320d7cb1cb1e735d2c20dd4f1ec0705d (patch) | |
| tree | adfba66fe69c9474b7e97c5169ec1bb9940eea1e /sd | |
| parent | 5d2b21e9473fa6ca88eb126a5c22f62fe5207e07 (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>
(cherry picked from commit 66b4e7ee179cba8ec2f1229ebc6eb48343fae72a)
Diffstat (limited to 'sd')
| -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 5229738d1b65..ce5f339326e7 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1650,6 +1650,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 (); |