sc/inc/address.hxx | 2 ++
sc/source/ui/view/gridwin.cxx | 7 +++++++
sc/source/ui/view/tabview3.cxx | 2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 381fcd48bfc76f4f3662675dc6eaccb998ca3b93
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Mon Oct 31 09:55:06 2016 -0400
Revert "sc lok: remove tiled row limitation"
Restoring row restriction at 1000 rows.
This reverts commit c253dd3de5ee430855de7f3a0967a647222cc70c.
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 8ac565c..4654ced 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -70,6 +70,8 @@ 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 3011b48..bbb18e0 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1981,6 +1981,13 @@ 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 942ca48..14fbad9 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, MAXROW);
+ nCurY = std::min(nCurY, comphelper::LibreOfficeKit::isActive() ?
MAXTILEDROW - 1 : MAXROW);
HideAllCursors();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
