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

[Noel Grandin (via logerrit)]

 sc/source/core/data/table2.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 51a0d544b146f00420f7a552353585e882377c5e
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Jun 23 16:46:22 2020 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Wed Jun 24 20:43:34 2020 +0200

    tdf#133326 Crash after redo
    
    regression from
        commit 7282014e362a1529a36c88eb308df8ed359c2cfa
        tdf#50916 Makes numbers of columns dynamic.
    
    Change-Id: I6a3d6b35dbd442014c84785d97cbd7eae19244cc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96958
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 240758a972eb99dd4d26fa6040ff0b6614036621)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96995
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit 21795a90432e1a26f3f8cbd6869f16090f069985)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97007
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 1eb549b29ade..0eeceed08ade 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1322,10 +1322,11 @@ void ScTable::UndoToTable(
 
         for ( SCCOL i = 0; i < aCol.size(); i++)
         {
+            auto& rDestCol = pDestTab->CreateColumnIfNotExists(i);
             if ( i >= nCol1 && i <= nCol2 )
-                aCol[i].UndoToColumn(rCxt, nRow1, nRow2, nFlags, bMarked, pDestTab->aCol[i]);
+                aCol[i].UndoToColumn(rCxt, nRow1, nRow2, nFlags, bMarked, rDestCol);
             else
-                aCol[i].CopyToColumn(rCxt, 0, pDocument->MaxRow(), InsertDeleteFlags::FORMULA, false, pDestTab->aCol[i]);
+                aCol[i].CopyToColumn(rCxt, 0, pDocument->MaxRow(), InsertDeleteFlags::FORMULA, false, rDestCol);
         }
 
         if (nFlags & InsertDeleteFlags::ATTRIB)