summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-04-18 12:21:36 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-04-18 14:15:40 +0200
commit5585dfdaf7180c5ab6fb1543ae2b66337c641fd5 (patch)
tree46d27e38e9398bd4ee7dc6e29ccb6092b635c038
parent2a8f2fd072c9de7b5dc538419565e3351bd0936a (diff)
tdf#124818 CRASH selecting all and switching spreadsheet
regression from commit 7282014e362a1529a36c88eb308df8ed359c2cfa Date: Fri Feb 1 15:15:16 2019 +0100 tdf#50916 Makes numbers of columns dynamic. Change-Id: I033bcae2bdc97c3aae24557c5949c7759041b3bc Reviewed-on: https://gerrit.libreoffice.org/70925 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--sc/source/core/data/table2.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 218ca0c8e1cc..4c303d9d3996 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1692,7 +1692,8 @@ bool ScTable::ContainsNotesInRange( const ScRange& rRange ) const
{
SCROW nStartRow = rRange.aStart.Row();
SCROW nEndRow = rRange.aEnd.Row();
- for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
+ SCCOL nEndCol = ClampToAllocatedColumns(rRange.aEnd.Col());
+ for (SCCOL nCol = rRange.aStart.Col(); nCol <= nEndCol; ++nCol)
{
bool bContainsNote = !aCol[nCol].IsNotesEmptyBlock(nStartRow, nEndRow);
if(bContainsNote)