diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-17 21:40:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-18 08:49:41 +0200 |
| commit | ac9aa53d51a4f359342274d107aed6df85658c55 (patch) | |
| tree | 1e5a16a4b92e2916980ada5e0f6c7fcc717b6f5e /sc/source/core/data/dociter.cxx | |
| parent | 3df2e918408535acd2c4d028bfae70901ad24e62 (diff) | |
crashtesting: failure on import of ooo6593-5.stc
since
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
Date: Fri Feb 1 15:15:16 2019 +0100
tdf#50916 Makes numbers of columns dynamic
Change-Id: I858e61b3a1158bf47b5855e56d63c77cc87aa09b
Reviewed-on: https://gerrit.libreoffice.org/70902
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/core/data/dociter.cxx')
| -rw-r--r-- | sc/source/core/data/dociter.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 8458e2895684..ec81363846f2 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -829,7 +829,6 @@ ScCellIterator::ScCellIterator( ScDocument* pDoc, const ScRange& rRange, Subtota maEndPos(rRange.aEnd), mnSubTotalFlags(nSubTotalFlags) { - maEndPos.SetCol( pDoc->ClampToAllocatedColumns(maStartPos.Tab(), maEndPos.Col()) ); init(); } @@ -914,7 +913,8 @@ bool ScCellIterator::getCurrent() do { maCurPos.IncCol(); - if (maCurPos.Col() > maEndPos.Col()) + if (maCurPos.Col() >= mpDoc->GetAllocatedColumnsCount(maCurPos.Tab()) + || maCurPos.Col() > maEndPos.Col()) { maCurPos.SetCol(maStartPos.Col()); maCurPos.IncTab(); |