sc/source/core/data/table2.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
New commits: commit 0ae68cfb76ea38ffefb79eb27e2329475f8bc71b Author: Noel Grandin <[email protected]> AuthorDate: Sat Sep 12 18:21:44 2020 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Sep 14 12:17:22 2020 +0200 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 <[email protected]> (cherry picked from commit 4176beb7ef831152ce92ac3fa31314438635ec2c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102634 Reviewed-by: Xisco Fauli <[email protected]> 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 ); } } } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
