diff options
author | Szymon Kłos <szymon.klos@collabora.com> | 2022-03-09 16:41:36 +0100 |
---|---|---|
committer | Szymon Kłos <szymon.klos@collabora.com> | 2022-03-14 08:42:20 +0100 |
commit | 419e9bd76382f5161a81694c5dbc0784eeda708e (patch) | |
tree | 5af5a2d26dc1fa1953192a45e90c396e30b604a6 /sc | |
parent | 0d069f8eeb25e59802c0a8d9cd05287f40aced1f (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>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/qa/unit/tiledrendering/tiledrendering.cxx | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index e7826eb5e227..b9b7e698c081 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -124,6 +124,7 @@ public: void testEditCursorBounds(); void testTextSelectionBounds(); void testSheetViewDataCrash(); + void testTextBoxInsert(); CPPUNIT_TEST_SUITE(ScTiledRenderingTest); CPPUNIT_TEST(testRowColumnHeaders); @@ -177,6 +178,7 @@ public: CPPUNIT_TEST(testEditCursorBounds); CPPUNIT_TEST(testTextSelectionBounds); CPPUNIT_TEST(testSheetViewDataCrash); + CPPUNIT_TEST(testTextBoxInsert); CPPUNIT_TEST_SUITE_END(); private: @@ -472,7 +474,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(2, aSeq.getLength()); @@ -836,7 +843,7 @@ void ScTiledRenderingTest::testViewLock() CPPUNIT_ASSERT(!aView1.m_bViewLock); } -static void lcl_extractHandleParameters(const OString& selection, int& id, int& x, int& y) +void lcl_extractHandleParameters(const OString& selection, int& id, int& x, int& y) { OString extraInfo = selection.copy(selection.indexOf("{")); std::stringstream aStream(extraInfo.getStr()); @@ -2888,6 +2895,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); |