[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sc/source

[Dennis Francis (via logerrit)]

 sc/source/ui/view/cliputil.cxx |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 360820c63c6406c5b67e109b340aaa9108a5fc84
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Tue Jan 19 10:56:04 2021 +0530
Commit:     Dennis Francis <dennis.francis at collabora.com>
CommitDate: Mon Apr 12 17:31:59 2021 +0200

    lok: Send rows heights invalidation on paste
    
    ... when the dest cell has wrap-text option set.
    
    Conflicts:
            sc/source/ui/view/cliputil.cxx
    
    Change-Id: I9f0dd157694701c96fd91e02b8232ed205f13ae4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109602
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 5fb8b1b2867af8dc5e55c769cf9923609709f914)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113972
    Tested-by: Dennis Francis <dennis.francis at collabora.com>
    Reviewed-by: Dennis Francis <dennis.francis at collabora.com>

diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx
index aa07e6d216c7..7b14bed2db6d 100644
--- a/sc/source/ui/view/cliputil.cxx
+++ b/sc/source/ui/view/cliputil.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <cliputil.hxx>
+#include <attrib.hxx>
 #include <viewdata.hxx>
 #include <tabvwsh.hxx>
 #include <transobj.hxx>
@@ -20,8 +21,10 @@
 #include <viewutil.hxx>
 #include <markdata.hxx>
 #include <gridwin.hxx>
+#include <scitems.hxx>
 
 #include <sfx2/classificationhelper.hxx>
+#include <comphelper/lok.hxx>
 
 namespace
 {
@@ -47,8 +50,10 @@ void ScClipUtil::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTab
 {
     const ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard(ScTabViewShell::GetClipData(pViewData->GetActiveWin()));
     ScDocument& rThisDoc = pViewData->GetDocument();
-    ScDPObject* pDPObj = rThisDoc.GetDPAtCursor( pViewData->GetCurX(),
-                         pViewData->GetCurY(), pViewData->GetTabNo() );
+    SCCOL nThisCol = pViewData->GetCurX();
+    SCROW nThisRow = pViewData->GetCurY();
+    SCTAB nThisTab = pViewData->GetTabNo();
+    ScDPObject* pDPObj = rThisDoc.GetDPAtCursor( nThisCol, nThisRow, nThisTab );
     if ( pOwnClip && pDPObj )
     {
         // paste from Calc into DataPilot table: sort (similar to drag & drop)
@@ -90,6 +95,16 @@ void ScClipUtil::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTab
                         bShowDialog );      // allow warning dialog
         }
     }
+    if (comphelper::LibreOfficeKit::isActive())
+    {
+        const ScLineBreakCell* pItem = rThisDoc.GetAttr(nThisCol, nThisRow, nThisTab, ATTR_LINEBREAK);
+        if (pItem && pItem->GetValue())
+        {
+            ScTabViewShell::notifyAllViewsSheetGeomInvalidation(
+                pTabViewShell, false /* bColumns */, true /* bRows */, true /* bSizes*/,
+                true /* bHidden */, true /* bFiltered */, true /* bGroups */, nThisTab);
+        }
+    }
     pTabViewShell->CellContentChanged();        // => PasteFromSystem() ???
 }