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

[Dennis Francis (via logerrit)]

 sc/source/ui/undo/undocell.cxx |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 681ef79921e2686080db8299b7891c9add6eaa1e
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Thu Jul 16 13:55:26 2020 +0530
Commit:     Dennis Francis <dennis.francis at collabora.com>
CommitDate: Fri Jul 17 06:12:55 2020 +0200

    lokit: add missing header and row-size invalidation calls...
    
    for ScUndoEnterData if there is a change in row height(s).
    
    Change-Id: I7d1e3a3ad8d55dcdb0cfbbc94521b83a7ac2b1ff
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98891
    Tested-by: Jenkins
    Reviewed-by: Dennis Francis <dennis.francis at collabora.com>
    (cherry picked from commit 2661685f4d73dac2997cc91a92f3e133b3518131)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98950
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 5b831552b5b1..6de4ed477e2b 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -22,6 +22,7 @@
 #include <scitems.hxx>
 #include <editeng/editobj.hxx>
 #include <sfx2/app.hxx>
+#include <comphelper/lok.hxx>
 
 #include <document.hxx>
 #include <docpool.hxx>
@@ -179,12 +180,23 @@ OUString ScUndoEnterData::GetComment() const
 void ScUndoEnterData::DoChange() const
 {
     // only when needed (old or new Edit cell, or Attribute)?
+    bool bHeightChanged = false;
     for (const auto & i : maOldValues)
-        pDocShell->AdjustRowHeight(maPos.Row(), maPos.Row(), i.mnTab);
+    {
+        if (pDocShell->AdjustRowHeight(maPos.Row(), maPos.Row(), i.mnTab))
+            bHeightChanged = true;
+    }
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
     {
+        if (comphelper::LibreOfficeKit::isActive() && bHeightChanged)
+        {
+            ScTabViewShell::notifyAllViewsHeaderInvalidation(pViewShell, ROW_HEADER, maPos.Tab());
+            ScTabViewShell::notifyAllViewsSheetGeomInvalidation(
+                pViewShell, false /* bColumns */, true /* bRows */, true /* bSizes*/,
+                false /* bHidden */, false /* bFiltered */, false /* bGroups */, maPos.Tab());
+        }
         pViewShell->SetTabNo(maPos.Tab());
         pViewShell->MoveCursorAbs(maPos.Col(), maPos.Row(), SC_FOLLOW_JUMP, false, false);
     }