sc/source/core/data/table2.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit ccef162b4c2623029c4c205063099584f9497342
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Sep 12 18:21:44 2020 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Sep 14 14:03:08 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 <noel.gran...@collabora.co.uk>
(cherry picked from commit 4176beb7ef831152ce92ac3fa31314438635ec2c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102635
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 638c02953219..3d1a1aabad37 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2574,10 +2574,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
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
