sc/source/ui/view/viewdata.cxx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
New commits: commit 7dda28234cc516e864aff9a6c97b7c539a063c4e Author: Eike Rathke <er...@redhat.com> Date: Fri Jul 29 18:18:01 2016 +0200 limit SelectionFillDOOM to 24117248 cells, tdf#60021 tdf#60056 related Change-Id: Idabf5e51b7f423d7d58094ad1caef166728c3bed (cherry picked from commit 5cf5975cef114870268bee792e44570ddfdaafe8) Reviewed-on: https://gerrit.libreoffice.org/27776 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 2364393..a135830 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -859,11 +859,16 @@ bool ScViewData::SelectionForbidsPaste() // static bool ScViewData::SelectionFillDOOM( const ScRange& rRange ) { - /* TODO: it is still possible to select one row less than the entire sheet - * and fool around. We could narrow this down to some "sane" value, just - * what would be sane? At least this helps against the Ctrl+A cases. */ - return rRange.aStart.Col() == 0 && rRange.aEnd.Col() == MAXCOL && - rRange.aStart.Row() == 0 && rRange.aEnd.Row() == MAXROW; + // Assume that more than 23 full columns (23M cells) will not be + // successful.. Even with only 10 bytes per cell that would already be + // 230MB, formula cells would be 100 bytes and more per cell. + // rows * columns > 23m => rows > 23m / columns + // to not overflow in case number of available columns or rows would be + // arbitrarily increased. + // We could refine this and take some actual cell size into account, + // evaluate available memory and what not, but.. + const sal_Int32 kMax = 23 * 1024 * 1024; // current MAXROWCOUNT is 1024*1024=1048576 + return (rRange.aEnd.Row() - rRange.aStart.Row() + 1) > (kMax / (rRange.aEnd.Col() - rRange.aStart.Col() + 1)); } void ScViewData::SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits