[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source
Caolán McNamara
caolanm at redhat.com
Thu Jun 7 12:07:49 UTC 2018
sd/source/ui/view/drviews2.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 66b4e7ee179cba8ec2f1229ebc6eb48343fae72a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 5 10:59:23 2018 +0100
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 at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
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 ();
More information about the Libreoffice-commits
mailing list