summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2020-09-12 18:21:44 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-09-13 08:13:18 +0200
commit4176beb7ef831152ce92ac3fa31314438635ec2c (patch)
tree9a056e7116a6dfee3e57e49e4675ea60a633dc0f
parentb42d55577566b2e6ca96530868a456b111632f94 (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>
-rw-r--r--sc/source/core/data/table2.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 6db4745722ac..c1018405b101 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 );
}
}
}