diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-09-12 18:21:44 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-09-14 12:17:22 +0200 |
| commit | 0ae68cfb76ea38ffefb79eb27e2329475f8bc71b (patch) | |
| tree | abfa2a4c293dc8497665b4edc4181c66072e2a96 | |
| parent | b8766a1555fe644fb7dabdfa943e84f6704c9cee (diff) | |
tdf#133327 fix calc loading background color with many cols
regression from
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
tdf#50916 Makes numbers of columns dynamic.
Change-Id: Ic9e1b31d74b11367a5ad1a82480ffe9467c37ad8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102535
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 4176beb7ef831152ce92ac3fa31314438635ec2c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102634
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | sc/source/core/data/table2.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index e6b0aa777e13..c523edcef7ae 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -2599,10 +2599,9 @@ void ScTable::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkDa for (const sc::ColRowSpan & rSpan : aSpans) { - SCCOL nEnd = ClampToAllocatedColumns(rSpan.mnEnd); - for (SCCOLROW i = rSpan.mnStart; i <= nEnd; ++i) + for (SCCOLROW i = rSpan.mnStart; i <= rSpan.mnEnd; ++i) { - aCol[i].MergeSelectionPattern( rState, rMark, bDeep ); + CreateColumnIfNotExists(i).MergeSelectionPattern( rState, rMark, bDeep ); } } } |