diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-06-23 16:28:04 +0200 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-06-24 15:30:01 +0200 |
commit | 613f02ad81a6acc759fb16946e1f7bbdb30c18f6 (patch) | |
tree | 9feb16577fa2ea442d8177205ae745465fc3d994 | |
parent | 2bf38c355df9e5ecc6ec90658fcebc32885ff7d0 (diff) |
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@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 8cad16207cb6d6df098d2a2f307df4fbc7519035)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96994
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
-rw-r--r-- | sc/source/core/data/table2.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 0eeceed08ade..7597ebaddba5 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -2611,6 +2611,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); |