[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jun 24 12:50:35 UTC 2020
sc/source/core/data/table2.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 8f8a9956cc2110990f7e4c9ddad53e30bd792bd5
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Jun 23 16:28:04 2020 +0200
Commit: Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Jun 24 14:50:03 2020 +0200
tdf#133629 calc, crash on format borders on multiple sheets
regression from
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
tdf#50916 Makes numbers of columns dynamic.
Change-Id: Ie862ec4a29d495c71aa3a21a1941f801fa3a789e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96957
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
(cherry picked from commit 8cad16207cb6d6df098d2a2f307df4fbc7519035)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96993
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index fe83548421d4..d9c72f1644f2 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2636,6 +2636,7 @@ void ScTable::ApplyBlockFrame(const SvxBoxItem& rLineOuter, const SvxBoxInfoItem
{
PutInOrder(nStartCol, nEndCol);
PutInOrder(nStartRow, nEndRow);
+ nEndCol = ClampToAllocatedColumns(nEndCol);
for (SCCOL i=nStartCol; i<=nEndCol; i++)
aCol[i].ApplyBlockFrame(rLineOuter, pLineInner,
nStartRow, nEndRow, (i==nStartCol), nEndCol-i);
More information about the Libreoffice-commits
mailing list