[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source

[Noel Grandin (via logerrit)]

 sc/source/core/data/table2.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 613f02ad81a6acc759fb16946e1f7bbdb30c18f6
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 15:30:01 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/+/96994
    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 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);