diff options
| author | Eike Rathke <erack@redhat.com> | 2014-11-28 19:31:35 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-01 09:26:05 +0000 |
| commit | b0504d472fc3abc419d2e0f678421ce9913156f1 (patch) | |
| tree | 26cd87c7e1c7ed902d0b3903ca9dd80034a95e16 | |
| parent | 38b53abc8594c262368fd5913793b85197cf1f71 (diff) | |
sanitize viewdata col/row values
Change-Id: Iec51b032c96189b20cd43934c477b587da3011a7
(cherry picked from commit d042bef351af4649e656bfb8c60273149e5daeb5)
Reviewed-on: https://gerrit.libreoffice.org/13181
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/ui/view/tabview4.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index e5370806c354..56d3c2271127 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -480,13 +480,10 @@ void ScTabView::InterpretVisible() ScHSplitPos eHWhich = WhichH( ScSplitPos(i) ); ScVSplitPos eVWhich = WhichV( ScSplitPos(i) ); - SCCOL nX1 = aViewData.GetPosX( eHWhich ); - SCROW nY1 = aViewData.GetPosY( eVWhich ); - SCCOL nX2 = nX1 + aViewData.VisibleCellsX( eHWhich ); - SCROW nY2 = nY1 + aViewData.VisibleCellsY( eVWhich ); - - if (nX2 > MAXCOL) nX2 = MAXCOL; - if (nY2 > MAXROW) nY2 = MAXROW; + SCCOL nX1 = SanitizeCol( aViewData.GetPosX( eHWhich )); + SCROW nY1 = SanitizeRow( aViewData.GetPosY( eVWhich )); + SCCOL nX2 = SanitizeCol( nX1 + aViewData.VisibleCellsX( eHWhich )); + SCROW nY2 = SanitizeRow( nY1 + aViewData.VisibleCellsY( eVWhich )); pDoc->InterpretDirtyCells(ScRange(nX1, nY1, nTab, nX2, nY2, nTab)); } |