[Libreoffice-commits] core.git: 2 commits - sd/qa sw/source

[merttumer (via logerrit)]

 sd/qa/unit/tiledrendering/tiledrendering.cxx |   26 ++++++++++++++++++++++++++
 sw/source/uibase/shells/basesh.cxx           |    3 +--
 2 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit 73c37ef7595cde0a9b46681106672170e3eb6ffb
Author:     merttumer <mert.tumer at collabora.com>
AuthorDate: Wed May 26 10:34:22 2021 +0300
Commit:     Mert Tumer <mert.tumer at collabora.com>
CommitDate: Fri Jun 4 20:02:57 2021 +0200

    lok: Re-Enable AnchorToPara context menu item
    
    Change-Id: I0f1f4121c06b8f628f4fe49284737cea3d28e4b8
    Signed-off-by: merttumer <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116141
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116301
    Tested-by: Jenkins

diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index df3d6da3976a..a81ae435829c 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -1779,8 +1779,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
 
                     if (comphelper::LibreOfficeKit::isActive())
                     {
-                        if (nWhich == FN_TOOL_ANCHOR_PAGE || nWhich == FN_TOOL_ANCHOR_PARAGRAPH
-                            || nWhich == FN_TOOL_ANCHOR_FRAME)
+                        if (nWhich == FN_TOOL_ANCHOR_PAGE || nWhich == FN_TOOL_ANCHOR_FRAME)
                         {
                             rSet.DisableItem(nWhich);
                         }
commit fe634a991bd94f9f1f0f9ef5c401648b8dd85f6c
Author:     merttumer <mert.tumer at collabora.com>
AuthorDate: Mon May 24 18:56:56 2021 +0300
Commit:     Mert Tumer <mert.tumer at collabora.com>
CommitDate: Fri Jun 4 20:02:46 2021 +0200

    sd: Unit test for Table deletion with Delete Key
    
    Change-Id: I9849f55a143007b49bdcaac392dd84e32d610998
    Signed-off-by: merttumer <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116069
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116300
    Tested-by: Jenkins

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 4b33a9c45b46..02f1968a8232 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -132,6 +132,7 @@ public:
     void testSpellOnlineRenderParameter();
     void testSlideDuplicateUndo();
     void testMoveShapeHandle();
+    void testDeleteTable();
 
     CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
     CPPUNIT_TEST(testCreateDestroy);
@@ -188,6 +189,7 @@ public:
     CPPUNIT_TEST(testSpellOnlineRenderParameter);
     CPPUNIT_TEST(testSlideDuplicateUndo);
     CPPUNIT_TEST(testMoveShapeHandle);
+    CPPUNIT_TEST(testDeleteTable);
 
     CPPUNIT_TEST_SUITE_END();
 
@@ -738,6 +740,30 @@ void SdTiledRenderingTest::testInsertTable()
     CPPUNIT_ASSERT(aPos.Y() != 0);
 }
 
+void SdTiledRenderingTest::testDeleteTable()
+{
+    SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp");
+
+    uno::Sequence<beans::PropertyValue> aArgs(comphelper::InitPropertySequence(
+    {
+        { "Rows", uno::makeAny(sal_Int32(3)) },
+        { "Columns", uno::makeAny(sal_Int32(5)) }
+    }));
+
+    comphelper::dispatchCommand(".uno:InsertTable", aArgs);
+    Scheduler::ProcessEventsToIdle();
+    sd::ViewShell* pViewShell = pXImpressDocument->GetDocShell()->GetViewShell();
+    SdrView* pSdrView = pViewShell->GetView();
+    const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
+    CPPUNIT_ASSERT(rMarkList.GetMarkCount());
+    pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_MOD1 | awt::Key::A);
+    pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_MOD1 | awt::Key::A);
+    pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_DELETE);
+    pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_DELETE);
+    Scheduler::ProcessEventsToIdle();
+    CPPUNIT_ASSERT(!rMarkList.GetMarkCount());
+}
+
 void SdTiledRenderingTest::testPartHash()
 {
     SdXImpressDocument* pDoc = createDoc("dummy.odp");