[Libreoffice-commits] core.git: include/svx sc/qa svx/source

[Szymon Kłos (via logerrit)]

 include/svx/svdedtv.hxx                      |    2 -
 sc/qa/unit/tiledrendering/tiledrendering.cxx |   31 ++++++++++++++++++++++++++-
 svx/source/svdraw/svdedtv.cxx                |    7 +++---
 3 files changed, 35 insertions(+), 5 deletions(-)

New commits:
commit 7fced7bbd0d6d7769dcf13ab326c793d4096a247
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Mar 9 16:41:36 2022 +0100
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Mar 14 16:04:48 2022 +0100

    svx: don't remove object right after insertion
    
    This is regression from:
    commit 2d95b3846eac367d2baadc194ab258dc31e7bd33
    Author: Tomaz Vajngerl <tomaz.vajng...@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 <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Mert Tumer <mert.tu...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131537
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 6f80c3aca0fa..d2c9b3816f6a 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -188,7 +188,7 @@ public:
      * Checks if this or other views have an active text edit, if true, end 
them.
      */
     void EndTextEditAllViews() const;
-    void EndTextEditCurrentView();
+    void EndTextEditCurrentView(bool bDontDeleteReally = false);
 
     std::vector< std::unique_ptr<SdrUndoAction> > CreateConnectorUndo( const 
SdrObject& rO );
     void AddUndoActions( std::vector< std::unique_ptr<SdrUndoAction> > );
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 5b84eef452b9..04c22438f74b 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:
@@ -456,7 +458,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());
@@ -2783,6 +2790,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);
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index c59b1e6be864..df42a3d78dea 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -1008,7 +1008,8 @@ bool SdrEditView::InsertObjectAtView(SdrObject* pObj, 
SdrPageView& rPV, SdrInser
     }
     if( IsUndoEnabled())
     {
-        EndTextEditCurrentView();
+        bool bDontDeleteReally = true;
+        EndTextEditCurrentView(bDontDeleteReally);
         AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pObj));
     }
 
@@ -1088,13 +1089,13 @@ void SdrEditView::EndTextEditAllViews() const
     }
 }
 
-void SdrEditView::EndTextEditCurrentView()
+void SdrEditView::EndTextEditCurrentView(bool bDontDeleteReally)
 {
     if (IsTextEdit())
     {
         SdrView* pSdrView = dynamic_cast<SdrView*>(this);
         if (pSdrView)
-            pSdrView->SdrEndTextEdit();
+            pSdrView->SdrEndTextEdit(bDontDeleteReally);
     }
 }