diff options
Diffstat (limited to 'sc/source/core/data/column3.cxx')
| -rw-r--r-- | sc/source/core/data/column3.cxx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index c7b157e8dc70..c311e37cab24 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -236,19 +236,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) |