summaryrefslogtreecommitdiff
path: root/sc/source/core/data/column3.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-05-29 10:45:39 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-05-29 11:02:46 +0100
commita35d92197d850527bd294eb6197b5bf83109d5be (patch)
tree441ec25ad80c567eddf34698f2e4bf25765b32df /sc/source/core/data/column3.cxx
parentda6df38b4193d03143172d73006adf34b3271f7b (diff)
Resolves: fdo#79392 don't access after last row, when last row is max last row
Change-Id: I06749af90bed6a43f3fb6b3b5ceb61d5fbbc7c02
Diffstat (limited to 'sc/source/core/data/column3.cxx')
-rw-r--r--sc/source/core/data/column3.cxx23
1 files changed, 13 insertions, 10 deletions
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index d023b162bb2b..aa84d8dce328 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -182,19 +182,22 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
// Check if there are any cells below the end row that will get shifted.
bool bShiftCells = false;
- aPos = maCells.position(itCell, nEndRow+1);
- itCell = aPos.first;
- if (itCell->type == sc::element_type_empty)
+ if (nEndRow < MAXROWCOUNT-1) //only makes sense to do this if there *is* a row after the end row
{
- // This block is empty. See if there is any block that follows.
- sc::CellStoreType::iterator itTest = itCell;
- ++itTest;
- if (itTest != maCells.end())
- // Non-empty block follows -> cells that will get shifted.
+ aPos = maCells.position(itCell, nEndRow+1);
+ itCell = aPos.first;
+ if (itCell->type == sc::element_type_empty)
+ {
+ // This block is empty. See if there is any block that follows.
+ sc::CellStoreType::iterator itTest = itCell;
+ ++itTest;
+ if (itTest != maCells.end())
+ // Non-empty block follows -> cells that will get shifted.
+ bShiftCells = true;
+ }
+ else
bShiftCells = true;
}
- else
- bShiftCells = true;
sc::SingleColumnSpanSet aNonEmptySpans;
if (bShiftCells)