summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2022-03-09 16:41:36 +0100
committerXisco Fauli <xiscofauli@libreoffice.org>2022-03-28 13:07:01 +0200
commita743d338c24407b4dec62f12dfff49621102eeac (patch)
tree17d0b8d746eced3d096b3f8af466d3b839cefc63 /sc
parent10ee1f9d52f28db0aff61fb6f4e08b3fedfd9d19 (diff)
svx: don't remove object right after insertion
This is regression from: commit 2d95b3846eac367d2baadc194ab258dc31e7bd33 Author: Tomaz Vajngerl <tomaz.vajngerl@collabora.co.uk> Date: Thu Oct 7 16:48:46 2021 +0200 svx: Don't end text edit mode for all views It was visible with "direct insertion" where user doesn't need to draw anything but textbox is inserted in the center of a screen (eg. used in LOK case) Object was inserted into a view and right after that was removed when EndTextEditCurrentView was called Change-Id: I9943d46746aabadf96d76d6e74770b56d648b79d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131263 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mert Tumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131537 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131596 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sc')
-rw-r--r--sc/qa/unit/tiledrendering/tiledrendering.cxx31
1 files changed, 30 insertions, 1 deletions
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index c4e0da7b9f87..6c6cd5990c3c 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -121,6 +121,7 @@ public:
void testEditCursorBounds();
void testTextSelectionBounds();
void testSheetViewDataCrash();
+ void testTextBoxInsert();
CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
CPPUNIT_TEST(testRowColumnHeaders);
@@ -175,6 +176,7 @@ public:
CPPUNIT_TEST(testEditCursorBounds);
CPPUNIT_TEST(testTextSelectionBounds);
CPPUNIT_TEST(testSheetViewDataCrash);
+ CPPUNIT_TEST(testTextBoxInsert);
CPPUNIT_TEST_SUITE_END();
private:
@@ -458,7 +460,12 @@ struct EditCursorMessage final {
std::stringstream aStream(pMessage);
boost::property_tree::ptree aTree;
boost::property_tree::read_json(aStream, aTree);
- std::string aVal = aTree.get_child("refpoint").get_value<std::string>();
+ std::string aVal;
+ boost::property_tree::ptree::const_assoc_iterator it = aTree.find("refpoint");
+ if (it != aTree.not_found())
+ aVal = aTree.get_child("refpoint").get_value<std::string>();
+ else
+ return; // happens in testTextBoxInsert test
uno::Sequence<OUString> aSeq = comphelper::string::convertCommaSeparated(OUString::createFromAscii(aVal.c_str()));
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aSeq.getLength());
@@ -2868,6 +2875,28 @@ void ScTiledRenderingTest::testSheetViewDataCrash()
Scheduler::ProcessEventsToIdle();
}
+void ScTiledRenderingTest::testTextBoxInsert()
+{
+ comphelper::LibreOfficeKit::setActive();
+
+ createDoc("empty.ods");
+ ViewCallback aView1;
+
+ // insert textbox
+ uno::Sequence<beans::PropertyValue> aArgs(
+ comphelper::InitPropertySequence({
+ { "CreateDirectly", uno::Any(true) }
+ }));
+ comphelper::dispatchCommand(".uno:DrawText", aArgs);
+ Scheduler::ProcessEventsToIdle();
+
+ // check if we have textbox selected
+ CPPUNIT_ASSERT(!aView1.m_ShapeSelection.isEmpty());
+ CPPUNIT_ASSERT(aView1.m_ShapeSelection != "EMPTY");
+
+ Scheduler::ProcessEventsToIdle();
+}
+
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScTiledRenderingTest);