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

[Ashod Nakashian]

 sc/inc/address.hxx             |    2 --
 sc/source/ui/view/gridwin.cxx  |    8 --------
 sc/source/ui/view/tabview3.cxx |    2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit f82d4c9aca65b89fb7243857ed55665ca88c496e
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Jun 13 21:50:43 2016 -0400

    Revert "sc lok: limit movement of the cursor"
    
    This reverts commit 538d0c92ae2d5cb36869360a0889bc063a854f47.
    
    No longer necessary with fast calc tile rendering.
    
    Change-Id: I82b020666abe13aa7a5292ad3c3dd979b970e2b0
    Reviewed-on: https://gerrit.libreoffice.org/26368
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 5fa88d7..f6650d4 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -71,8 +71,6 @@ const SCROW       MAXROW         = MAXROWCOUNT - 1;
 const SCCOL       MAXCOL         = MAXCOLCOUNT - 1;
 const SCTAB       MAXTAB         = MAXTABCOUNT - 1;
 const SCCOLROW    MAXCOLROW      = MAXROW;
-// Maximun tiled rendering values
-const SCROW       MAXTILEDROW    = 1000;
 // Limit the initial tab count to prevent users to set the count too high,
 // which could cause the memory usage of blank documents to exceed the
 // available system memory.
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 970e2e1..e163f61 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -137,7 +137,6 @@
 #include <comphelper/string.hxx>
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include <comphelper/lok.hxx>
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
@@ -1989,13 +1988,6 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta
     pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
     SCTAB nTab = pViewData->GetTabNo();
 
-    if ( comphelper::LibreOfficeKit::isActive() && nPosY > MAXTILEDROW - 1 )
-    {
-        nButtonDown = 0;
-        nMouseStatus = SC_GM_NONE;
-        return;
-    }
-
     // Auto filter / pivot table / data select popup.  This shouldn't activate the part.
 
     if ( !bDouble && !bFormulaMode && rMEvt.IsLeft() )
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index e7cabb2..21a9a6b 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -1020,7 +1020,7 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
     if (nCurX < 0) nCurX = 0;
     if (nCurY < 0) nCurY = 0;
     if (nCurX > MAXCOL) nCurX = MAXCOL;
-    nCurY = std::min(nCurY, comphelper::LibreOfficeKit::isActive() ? MAXTILEDROW - 1 : MAXROW);
+    if (nCurY > MAXROW) nCurY = MAXROW;
 
     HideAllCursors();