commit 6eae30f631ec9b0f2b1415c06f4c36a3d6e13055
author Xisco Fauli <xiscofauli@libreoffice.org> Tue Jul 30 15:51:58 2019 +0200
committer Xisco Faulí <xiscofauli@libreoffice.org> Tue Jul 30 18:39:26 2019 +0200
tree e22d9c9a1ee41dbcb02179b277652a3983a4be0f
parent 4289b91d490b40420cb69d585937c892b2cb6261

tdf#126605: Do not end TextEdit when changing an attribute

otherwise, pTextEditOutlinerView becomes nullptr in
svx/source/svdraw/svdedxv.cxx:2184

Regression from e6c7a018a0cfee395ce2886d41c908a2447ef5cc

Change-Id: I9d0645f637dc92b50d01682d119c0db60238e921
Reviewed-on: https://gerrit.libreoffice.org/76606
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

sd/qa/uitest/impress_tests/tdf126605.py

diff --git a/sd/qa/uitest/impress_tests/tdf126605.py b/sd/qa/uitest/impress_tests/tdf126605.py
new file mode 100644
index 0000000..7443247
--- /dev/null
+++ b/sd/qa/uitest/impress_tests/tdf126605.py
@@ -0,0 +1,28 @@
# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

from uitest.framework import UITestCase
from libreoffice.uno.propertyvalue import mkPropertyValues

class tdf126605(UITestCase):

   def test_run(self):
        self.ui_test.create_doc_in_start_center("impress")
        xTemplateDlg = self.xUITest.getTopFocusWindow()
        xCancelBtn = xTemplateDlg.getChild("cancel")
        self.ui_test.close_dialog_through_button(xCancelBtn)

        xDoc = self.xUITest.getTopFocusWindow()
        xEdit = xDoc.getChild("impress_win")
        xEdit.executeAction("TYPE", mkPropertyValues({"TEXT":"test"}))

        # Without the accompanying fix in place, it would crash at this point
        self.xUITest.executeCommand(".uno:ParaRightToLeft")
        self.xUITest.executeCommand(".uno:ParaLeftToRight")

        self.ui_test.close_doc()

# vim: set shiftwidth=4 softtabstop=4 expandtab:

svx/source/svdraw/svdedtv1.cxx

diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 44c4b2f..b750990 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -765,8 +765,6 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr)
    }

    const bool bUndo = IsUndoEnabled();
    if( bUndo )
        EndTextEditAllViews();

    // TODO: check if WhichRange is necessary.
    const size_t nMarkCount=GetMarkedObjectCount();