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

[Noel Grandin (via logerrit)]

 sc/source/core/data/documen8.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 0f6c33bdf691cc5ea048e7fb5e5ee7ee539eb643
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Aug 7 14:04:15 2019 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Wed Aug 7 21:12:15 2019 +0200

    tdf#126685 CRASH: selecting all in sheet
    
    regression from
        commit 7282014e362a1529a36c88eb308df8ed359c2cfa
        Date:   Fri Feb 1 15:15:16 2019 +0100
        tdf#50916 Makes numbers of columns dynamic.
    
    We need to clamp the columns whenever we change sheet/table
    
    Change-Id: I5cf22b2a7cf2f6473b8340289bcddd75ed0ad70b
    Reviewed-on: https://gerrit.libreoffice.org/77105
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit d1cddc4775f03a52bb8fa2229dc5624d8cc5a3ce)
    Reviewed-on: https://gerrit.libreoffice.org/77125
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index aefbcb293d70..546b3b015c3f 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -648,13 +648,12 @@ bool ScDocument::IdleCalcTextWidth()            // true = try next again
                 bNewTab = true;
             }
 
-            aScope.setCol(pTab->ClampToAllocatedColumns(aScope.Col()));
-
             if ( nRestart < 2 )
             {
                 if ( bNewTab )
                 {
                     pTab = maTabs[aScope.Tab()].get();
+                    aScope.setCol(pTab->ClampToAllocatedColumns(aScope.Col()));
                     pStyle = static_cast<ScStyleSheet*>(aScope.getStylePool()->Find(
                         pTab->aPageStyle, SfxStyleFamily::Page));