summaryrefslogtreecommitdiff
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 15:00:05 +0200
commit8bf0149b11239fed187ff20dd37116661907c442 (patch)
treef71ab40c3c6518c103c34278b8c6254d2a341ece
parent1c4cd77beeec3b40fb73afa8b77dbf897451a2aa (diff)
tdf#117940 setting resize shape while text edit active not recorded in undo
Change-Id: I0887a1caea96f3efe897c304cde0520d59da6c59 Reviewed-on: https://gerrit.libreoffice.org/55323 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-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 ();