summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2019-07-30 15:51:58 +0200
committerMiklos Vajna <vmiklos@collabora.com>2019-08-01 10:53:43 +0200
commit4155ed274d84135fc895d761d7ddcf0b462dccba (patch)
tree2d7f24b3fe2bb17a14bdf9ce7ac0038dd0702fc4
parent0c219b167172c456dc0ebaf734380461907ec2b4 (diff)
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/76712 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r--sd/qa/uitest/impress_tests/tdf126605.py28
-rw-r--r--svx/source/svdraw/svdedtv1.cxx2
2 files changed, 28 insertions, 2 deletions
diff --git a/sd/qa/uitest/impress_tests/tdf126605.py b/sd/qa/uitest/impress_tests/tdf126605.py
new file mode 100644
index 000000000000..744324717a6b
--- /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:
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 61322578b444..6205ecf94125 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -762,8 +762,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();