[Libreoffice-commits] core.git: sd/source

[Libreoffice Gerrit user]

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

New commits:
commit 3d9f973e6648c5819608237f390df523b6a32ed8
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Mar 10 11:37:55 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu Mar 21 10:48:43 2019 +0100

    Related tdf#122788: avoid assert
    
    See:
    - https://bugs.documentfoundation.org/attachment.cgi?id=149853
    - https://bugs.documentfoundation.org/attachment.cgi?id=149854
    - https://bugs.documentfoundation.org/show_bug.cgi?id=122788#c5
    - https://bugs.documentfoundation.org/show_bug.cgi?id=122788#c6
    
    Change-Id: Icd1d4afcd05bf5398813505702bf244bd18fbfee
    Reviewed-on: https://gerrit.libreoffice.org/69006
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index e86136bb79a4..df322f51706b 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1422,6 +1422,12 @@ void SdOutliner::EnterEditMode (bool bGrabFocus)
     pViewShell->GetDispatcher()->ExecuteList(SID_TEXTEDIT,
             SfxCallMode::SYNCHRON | SfxCallMode::RECORD, { &aItem });
 
+    if (mpView->IsTextEdit())
+    {
+        // end text edition before starting it again
+        mpView->SdrEndTextEdit();
+    }
+
     // To be consistent with the usual behaviour in the Office the text
     // object that is put into edit mode would have also to be selected.
     // Starting the text edit mode is not enough so we do it here by