diff options
| author | Henry Castro <hcastro@collabora.com> | 2016-06-01 14:24:12 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2016-06-01 15:50:28 -0400 |
| commit | 538d0c92ae2d5cb36869360a0889bc063a854f47 (patch) | |
| tree | 8fe6618a4b66e4631040897ae3ffe5365051d355 | |
| parent | 4b2c9e9b6641160829af143885fda48a78a2a3a7 (diff) | |
sc lok: limit movement of the cursor
Change-Id: Ic7fe2dec012efb8ba180feb4d3df6f4bfbf6c38a
| -rw-r--r-- | sc/inc/address.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/gridwin.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/view/tabview3.cxx | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index f6650d4e975f..5fa88d7747a5 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 e163f6133a7e..970e2e197d04 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 21a9a6b94d63..e7cabb2c5971 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(); |