[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source

[Caolán McNamara]

 sd/source/ui/view/drviews2.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1c0e0646321e276c6be22a13a70e37fdf93430e1
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/55325
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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 ();