sc/inc/address.hxx | 2 ++
sc/source/ui/view/gridwin.cxx | 8 ++++++++
sc/source/ui/view/tabview3.cxx | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 538d0c92ae2d5cb36869360a0889bc063a854f47
Author: Henry Castro <hcas...@collabora.com>
Date: Wed Jun 1 14:24:12 2016 -0400
sc lok: limit movement of the cursor
Change-Id: Ic7fe2dec012efb8ba180feb4d3df6f4bfbf6c38a
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index f6650d4..5fa88d7 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -71,6 +71,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 e163f61..970e2e1 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -137,6 +137,7 @@
#include <comphelper/string.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#include <comphelper/lok.hxx>
#include <vector>
#include <boost/shared_ptr.hpp>
@@ -1988,6 +1989,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 21a9a6b..e7cabb2 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;
- if (nCurY > MAXROW) 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
