[Libreoffice-commits] core.git: sc/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Apr 12 07:52:57 UTC 2019


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

New commits:
commit b240c12ef26d9bfb4e2580b1304e5180fb83e1aa
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Apr 11 15:48:08 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Apr 12 09:51:50 2019 +0200

    crashtesting: failed on reexport of fdo64646-4.xls
    
    since...
    
    commit 7282014e362a1529a36c88eb308df8ed359c2cfa
    Date:   Fri Feb 1 15:15:16 2019 +0100
    
        tdf#50916 Makes numbers of columns dynamic
    
    Change-Id: Id013d1005605f7c7b58b4065ead1e6053cedd45d
    Reviewed-on: https://gerrit.libreoffice.org/70601
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 2a288c46423f..e48f2393977f 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1952,7 +1952,7 @@ sal_uInt32 ScTable::GetNumberFormat( const ScInterpreterContext& rContext, const
 sal_uInt32 ScTable::GetNumberFormat( SCCOL nCol, SCROW nRow ) const
 {
     if (ValidColRow(nCol,nRow))
-        return aCol[nCol].GetNumberFormat( pDocument->GetNonThreadedContext(), nRow );
+        return CreateColumnIfNotExists(nCol).GetNumberFormat(pDocument->GetNonThreadedContext(), nRow);
     else
         return 0;
 }
@@ -1962,7 +1962,7 @@ sal_uInt32 ScTable::GetNumberFormat( SCCOL nCol, SCROW nStartRow, SCROW nEndRow
     if (!ValidCol(nCol) || !ValidRow(nStartRow) || !ValidRow(nEndRow))
         return 0;
 
-    return aCol[nCol].GetNumberFormat(nStartRow, nEndRow);
+    return CreateColumnIfNotExists(nCol).GetNumberFormat(nStartRow, nEndRow);
 }
 
 void ScTable::SetNumberFormat( SCCOL nCol, SCROW nRow, sal_uInt32 nNumberFormat )


More information about the Libreoffice-commits mailing list