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

[Luboš Luňák (via logerrit)]

 sc/inc/table.hxx               |    2 +
 sc/source/core/data/table2.cxx |   42 +++++++++++------------------------------
 2 files changed, 14 insertions(+), 30 deletions(-)

New commits:
commit a15c02effa654da06e9695b5e4c0c595f851a878
Author:     Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Wed Mar 9 11:45:34 2022 +0100
Commit:     Luboš Luňák <l.lu...@collabora.com>
CommitDate: Thu Mar 10 08:34:37 2022 +0100

    add ColumnData() for simple handling of unallocated column data
    
    Move the decision whether to return a column or the default data
    for unallocated columns into a simple function.
    
    Change-Id: I369b8c815de96b61181f2483c6afac44a5c3bc2e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131264
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lu...@collabora.com>

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index a50263142718..7fe49f2722b7 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -1118,6 +1118,8 @@ public:
 
     std::set<SCCOL> QueryColumnsWithFormulaCells() const;
 
+    const ScColumnData& ColumnData( SCCOL nCol ) const { return nCol < 
aCol.size() ? aCol[ nCol ] : aDefaultColData; }
+
     void CheckIntegrity() const;
 
 private:
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 79c45ed386a4..fa7a73ad3d00 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2163,28 +2163,20 @@ const SfxPoolItem* ScTable::GetAttr( SCCOL nCol, SCROW 
nRow, sal_uInt16 nWhich )
 {
     if (!ValidColRow(nCol, nRow))
         return nullptr;
-    if (nCol < GetAllocatedColumnsCount())
-        return &aCol[nCol].GetAttr( nRow, nWhich );
-    return &aDefaultColData.GetAttr( nRow, nWhich );
+    return &ColumnData(nCol).GetAttr( nRow, nWhich );
 }
 
 const SfxPoolItem* ScTable::GetAttr( SCCOL nCol, SCROW nRow, sal_uInt16 
nWhich, SCROW& nStartRow, SCROW& nEndRow ) const
 {
     if (!ValidColRow(nCol, nRow))
         return nullptr;
-    if (nCol < GetAllocatedColumnsCount())
-        return &aCol[nCol].GetAttr( nRow, nWhich, nStartRow, nEndRow );
-    return &aDefaultColData.GetAttr( nRow, nWhich, nStartRow, nEndRow );
+    return &ColumnData(nCol).GetAttr( nRow, nWhich, nStartRow, nEndRow );
 }
 
 sal_uInt32 ScTable::GetNumberFormat( const ScInterpreterContext& rContext, 
const ScAddress& rPos ) const
 {
     if (ValidColRow(rPos.Col(), rPos.Row()))
-    {
-        if (rPos.Col() < GetAllocatedColumnsCount())
-            return aCol[rPos.Col()].GetNumberFormat(rContext, rPos.Row());
-        return aDefaultColData.GetNumberFormat(rContext, rPos.Row());
-    }
+        return ColumnData(rPos.Col()).GetNumberFormat(rContext, rPos.Row());
     return 0;
 }
 
@@ -2198,9 +2190,7 @@ sal_uInt32 ScTable::GetNumberFormat( SCCOL nCol, SCROW 
nStartRow, SCROW nEndRow
     if (!ValidCol(nCol) || !ValidRow(nStartRow) || !ValidRow(nEndRow))
         return 0;
 
-    if (nCol < GetAllocatedColumnsCount())
-        return aCol[nCol].GetNumberFormat(nStartRow, nEndRow);
-    return aDefaultColData.GetNumberFormat(nStartRow, nEndRow);
+    return ColumnData(nCol).GetNumberFormat(nStartRow, nEndRow);
 }
 
 void ScTable::SetNumberFormat( SCCOL nCol, SCROW nRow, sal_uInt32 
nNumberFormat )
@@ -2213,19 +2203,16 @@ void ScTable::SetNumberFormat( SCCOL nCol, SCROW nRow, 
sal_uInt32 nNumberFormat
 
 const ScPatternAttr* ScTable::GetPattern( SCCOL nCol, SCROW nRow ) const
 {
-    if (ValidColRow(nCol,nRow) && nCol < GetAllocatedColumnsCount())
-        return aCol[nCol].GetPattern( nRow );
-    else
-        return aDefaultColData.GetPattern( nRow );
+    if (!ValidColRow(nCol,nRow))
+        return nullptr;
+    return ColumnData(nCol).GetPattern( nRow );
 }
 
 const ScPatternAttr* ScTable::GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, 
SCROW nEndRow ) const
 {
-    if ( ValidColRow( nCol, nStartRow ) && ValidRow( nEndRow ) && (nStartRow 
<= nEndRow)
-        && nCol < GetAllocatedColumnsCount())
-        return aCol[nCol].GetMostUsedPattern( nStartRow, nEndRow );
-    else
-        return aDefaultColData.GetMostUsedPattern( nStartRow, nEndRow );
+    if ( ValidColRow( nCol, nStartRow ) && ValidRow( nEndRow ) && (nStartRow 
<= nEndRow))
+        return ColumnData(nCol).GetMostUsedPattern( nStartRow, nEndRow );
+    return nullptr;
 }
 
 bool ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, 
HasAttrFlags nMask ) const
@@ -2240,9 +2227,7 @@ bool ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2, Has
 
 bool ScTable::HasAttrib( SCCOL nCol, SCROW nRow, HasAttrFlags nMask, SCROW* 
nStartRow, SCROW* nEndRow ) const
 {
-    if( nCol < aCol.size())
-        return aCol[nCol].HasAttrib( nRow, nMask, nStartRow, nEndRow );
-    return aDefaultColData.HasAttrib( nRow, nMask, nStartRow, nEndRow );
+    return ColumnData(nCol).HasAttrib( nRow, nMask, nStartRow, nEndRow );
 }
 
 bool ScTable::HasAttribSelection( const ScMarkData& rMark, HasAttrFlags nMask 
) const
@@ -2950,10 +2935,7 @@ const ScStyleSheet* ScTable::GetStyle( SCCOL nCol, SCROW 
nRow ) const
 {
     if ( !ValidColRow( nCol, nRow ) )
         return nullptr;
-    if ( nCol < aCol.size() )
-        return aCol[nCol].GetStyle( nRow );
-    else
-        return aDefaultColData.GetStyle( nRow );
+    return ColumnData(nCol).GetStyle( nRow );
 }
 
 const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, bool& 
rFound ) const