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

Ashod Nakashian ashod.nakashian at collabora.co.uk
Tue Oct 25 15:03:48 UTC 2016


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

New commits:
commit c253dd3de5ee430855de7f3a0967a647222cc70c
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Tue Oct 25 10:06:41 2016 -0400

    sc lok: remove tiled row limitation
    
    Change-Id: I2d9556d7f233878453383a8b3ed588f86fb01a78
    Reviewed-on: https://gerrit.libreoffice.org/30274
    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 4654ced..8ac565c 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -70,8 +70,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 bbb18e0..3011b48 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1981,13 +1981,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 14fbad9..942ca48 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -1092,7 +1092,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);
+    nCurY = std::min(nCurY, MAXROW);
 
     HideAllCursors();
 


More information about the Libreoffice-commits mailing list