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

[Jan Holesovsky]

 sc/source/ui/docshell/docsh3.cxx |    8 ++++++++
 sc/source/ui/view/viewfun2.cxx   |    3 ---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit e35ae1b6726166f443e8309b8ce96bc243c8a355
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Mar 18 15:52:55 2016 +0100

    sc lok bccu#1519: More general solution to detecting cell resizes.
    
    This covers even the row height updates when the text in the cell changes etc.
    
    Change-Id: Idb570fa2c3c4d3c6bcdb381f8ce07a0311354083

diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 2bb995f..a0340a1 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -63,6 +63,9 @@
 #include "markdata.hxx"
 #include <boost/scoped_ptr.hpp>
 
+#include <comphelper/lok.hxx>
+#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+
 //          Redraw - Benachrichtigungen
 
 void ScDocShell::PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos )
@@ -159,6 +162,11 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, sal_uInt16 nPart, sal_uI
     }
 
     Broadcast(ScPaintHint(aPaintRanges.Combine(), nPart));
+
+    // LOK: we are supposed to update the row / columns headers (and actually
+    // the document size too - cell size affects that, obviously)
+    if ((nPart & (PAINT_TOP | PAINT_LEFT)) && comphelper::LibreOfficeKit::isActive() && aDocument.GetDrawLayer())
+        aDocument.GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_DOCUMENT_SIZE_CHANGED, "");
 }
 
 void ScDocShell::PostPaintGridAll()
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 463678a..86f3c89 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -165,9 +165,6 @@ bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData )
     if ( bPaint && bAnyChanged )
         pDocSh->UpdateOle(&GetViewData());
 
-    if (bAnyChanged && comphelper::LibreOfficeKit::isActive() && rDoc.GetDrawLayer())
-        rDoc.GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_DOCUMENT_SIZE_CHANGED, "");
-
     return bAnyChanged;
 }