[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/qa sc/source

[Gökay Şatır (via logerrit)]

 sc/qa/unit/tiledrendering/tiledrendering.cxx |    4 ++--
 sc/source/ui/view/cliputil.cxx               |   14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 4b6da738fdd934bfac1bb9779682398bea771867
Author:     Gökay Şatır <gokay.satir at collabora.com>
AuthorDate: Sun Mar 28 13:18:56 2021 +0300
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Apr 12 10:02:49 2021 +0200

    Calc: Send sheet invalidation for full row/col ops
    
    Change-Id: I4da476804d2dfaf11c1cfd6cbe11cc4a651e0f09
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113251
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index cfcefe7ccd71..0cd4543c0a73 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2363,8 +2363,8 @@ void ScTiledRenderingTest::testPasteIntoWrapTextCell()
     pView->GetViewFrame()->GetBindings().Execute(SID_PASTE);
     Scheduler::ProcessEventsToIdle();
 
-    // SG invalidations for rows
-    CPPUNIT_ASSERT_EQUAL(OString("rows"), aView.m_sInvalidateSheetGeometry);
+    // SG invalidations for all
+    CPPUNIT_ASSERT_EQUAL(OString("all"), aView.m_sInvalidateSheetGeometry);
 
     SfxViewShell::Current()->registerLibreOfficeKitViewCallback(nullptr, nullptr);
 }
diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx
index 31bbf37d80e5..9a589d8e30f5 100644
--- a/sc/source/ui/view/cliputil.cxx
+++ b/sc/source/ui/view/cliputil.cxx
@@ -96,11 +96,21 @@ void ScClipUtil::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTab
     }
     if (comphelper::LibreOfficeKit::isActive())
     {
+        bool entireColumnOrRowSelected = false;
+        if (pOwnClip)
+        {
+            ScClipParam clipParam = pOwnClip->GetDocument()->GetClipParam();
+            if (clipParam.maRanges.size() > 0)
+            {
+                if (clipParam.maRanges[0].aEnd.Col() == MAXCOLCOUNT -1 || clipParam.maRanges[0].aEnd.Row() == MAXROWCOUNT - 1)
+                    entireColumnOrRowSelected = true;
+            }
+        }
         const SfxBoolItem* pItem = static_cast<const SfxBoolItem*>(pThisDoc->GetAttr(nThisCol, nThisRow, nThisTab, ATTR_LINEBREAK));
-        if (pItem->GetValue())
+        if (pItem->GetValue() || entireColumnOrRowSelected)
         {
             ScTabViewShell::notifyAllViewsSheetGeomInvalidation(
-                pTabViewShell, false /* bColumns */, true /* bRows */, true /* bSizes*/,
+                pTabViewShell, true /* bColumns */, true /* bRows */, true /* bSizes*/,
                 true /* bHidden */, true /* bFiltered */, true /* bGroups */, nThisTab);
         }
     }