sc/source/filter/excel/xlformula.cxx | 22 +++++++++++-----------
sc/source/filter/oox/formulabase.cxx | 22 +++++++++++-----------
2 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit c437ccaab235320995af8c272705ac7c01784dd8
Author: Dr. David Alan Gilbert <d...@treblig.org>
AuthorDate: Sat Jun 10 01:58:09 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jun 13 16:24:55 2023 +0200
tdf#147021: sc/source/filter SAL_N_ELEMENTS usage
Two blocks that just use SAL_N_ELEMENTS in a form:
func(array, array+SAL_N_ELEMENTS(array))
just use std::end for the end of it; I'm not seeing an easier
way to pass the whole array in one.
Change-Id: I1a229d735385cad6d3d4d7c48a6841906f3a8150
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152807
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sc/source/filter/excel/xlformula.cxx
b/sc/source/filter/excel/xlformula.cxx
index e2e082ac2651..2612f0d3dc45 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -656,21 +656,21 @@ XclFunctionProvider::XclFunctionProvider( const XclRoot&
rRoot )
from earlier tables. */
XclBiff eBiff = rRoot.GetBiff();
if( eBiff >= EXC_BIFF2 )
- (this->*pFillFunc)(saFuncTable_2, saFuncTable_2 +
SAL_N_ELEMENTS(saFuncTable_2));
+ (this->*pFillFunc)(saFuncTable_2, std::end(saFuncTable_2));
if( eBiff >= EXC_BIFF3 )
- (this->*pFillFunc)(saFuncTable_3, saFuncTable_3 +
SAL_N_ELEMENTS(saFuncTable_3));
+ (this->*pFillFunc)(saFuncTable_3, std::end(saFuncTable_3));
if( eBiff >= EXC_BIFF4 )
- (this->*pFillFunc)(saFuncTable_4, saFuncTable_4 +
SAL_N_ELEMENTS(saFuncTable_4));
+ (this->*pFillFunc)(saFuncTable_4, std::end(saFuncTable_4));
if( eBiff >= EXC_BIFF5 )
- (this->*pFillFunc)(saFuncTable_5, saFuncTable_5 +
SAL_N_ELEMENTS(saFuncTable_5));
+ (this->*pFillFunc)(saFuncTable_5, std::end(saFuncTable_5));
if( eBiff >= EXC_BIFF8 )
- (this->*pFillFunc)(saFuncTable_8, saFuncTable_8 +
SAL_N_ELEMENTS(saFuncTable_8));
- (this->*pFillFunc)(saFuncTable_Oox, saFuncTable_Oox +
SAL_N_ELEMENTS(saFuncTable_Oox));
- (this->*pFillFunc)(saFuncTable_2010, saFuncTable_2010 +
SAL_N_ELEMENTS(saFuncTable_2010));
- (this->*pFillFunc)(saFuncTable_2013, saFuncTable_2013 +
SAL_N_ELEMENTS(saFuncTable_2013));
- (this->*pFillFunc)(saFuncTable_2016, saFuncTable_2016 +
SAL_N_ELEMENTS(saFuncTable_2016));
- (this->*pFillFunc)(saFuncTable_Odf, saFuncTable_Odf +
SAL_N_ELEMENTS(saFuncTable_Odf));
- (this->*pFillFunc)(saFuncTable_OOoLO, saFuncTable_OOoLO +
SAL_N_ELEMENTS(saFuncTable_OOoLO));
+ (this->*pFillFunc)(saFuncTable_8, std::end(saFuncTable_8));
+ (this->*pFillFunc)(saFuncTable_Oox, std::end(saFuncTable_Oox));
+ (this->*pFillFunc)(saFuncTable_2010, std::end(saFuncTable_2010));
+ (this->*pFillFunc)(saFuncTable_2013, std::end(saFuncTable_2013));
+ (this->*pFillFunc)(saFuncTable_2016, std::end(saFuncTable_2016));
+ (this->*pFillFunc)(saFuncTable_Odf, std::end(saFuncTable_Odf));
+ (this->*pFillFunc)(saFuncTable_OOoLO, std::end(saFuncTable_OOoLO));
}
const XclFunctionInfo* XclFunctionProvider::GetFuncInfoFromXclFunc( sal_uInt16
nXclFunc ) const
diff --git a/sc/source/filter/oox/formulabase.cxx
b/sc/source/filter/oox/formulabase.cxx
index 8594bce693b8..7603d0f17833 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -999,17 +999,17 @@ FunctionProviderImpl::FunctionProviderImpl( bool
bImportFilter )
/* Add functions supported in the current BIFF version only. Function
tables from later BIFF versions may overwrite single functions from
earlier tables. */
- initFuncs(saFuncTableBiff2, saFuncTableBiff2 +
SAL_N_ELEMENTS(saFuncTableBiff2), bImportFilter);
- initFuncs(saFuncTableBiff3, saFuncTableBiff3 +
SAL_N_ELEMENTS(saFuncTableBiff3), bImportFilter);
- initFuncs(saFuncTableBiff4, saFuncTableBiff4 +
SAL_N_ELEMENTS(saFuncTableBiff4), bImportFilter);
- initFuncs(saFuncTableBiff5, saFuncTableBiff5 +
SAL_N_ELEMENTS(saFuncTableBiff5), bImportFilter);
- initFuncs(saFuncTableBiff8, saFuncTableBiff8 +
SAL_N_ELEMENTS(saFuncTableBiff8), bImportFilter);
- initFuncs(saFuncTableOox , saFuncTableOox +
SAL_N_ELEMENTS(saFuncTableOox ), bImportFilter);
- initFuncs(saFuncTable2010 , saFuncTable2010 +
SAL_N_ELEMENTS(saFuncTable2010 ), bImportFilter);
- initFuncs(saFuncTable2013 , saFuncTable2013 +
SAL_N_ELEMENTS(saFuncTable2013 ), bImportFilter);
- initFuncs(saFuncTable2016 , saFuncTable2016 +
SAL_N_ELEMENTS(saFuncTable2016 ), bImportFilter);
- initFuncs(saFuncTableOdf , saFuncTableOdf +
SAL_N_ELEMENTS(saFuncTableOdf ), bImportFilter);
- initFuncs(saFuncTableOOoLO, saFuncTableOOoLO +
SAL_N_ELEMENTS(saFuncTableOOoLO), bImportFilter);
+ initFuncs(saFuncTableBiff2, std::end(saFuncTableBiff2), bImportFilter);
+ initFuncs(saFuncTableBiff3, std::end(saFuncTableBiff3), bImportFilter);
+ initFuncs(saFuncTableBiff4, std::end(saFuncTableBiff4), bImportFilter);
+ initFuncs(saFuncTableBiff5, std::end(saFuncTableBiff5), bImportFilter);
+ initFuncs(saFuncTableBiff8, std::end(saFuncTableBiff8), bImportFilter);
+ initFuncs(saFuncTableOox , std::end(saFuncTableOox) , bImportFilter);
+ initFuncs(saFuncTable2010 , std::end(saFuncTable2010) , bImportFilter);
+ initFuncs(saFuncTable2013 , std::end(saFuncTable2013) , bImportFilter);
+ initFuncs(saFuncTable2016 , std::end(saFuncTable2016) , bImportFilter);
+ initFuncs(saFuncTableOdf , std::end(saFuncTableOdf) , bImportFilter);
+ initFuncs(saFuncTableOOoLO, std::end(saFuncTableOOoLO), bImportFilter);
}
void FunctionProviderImpl::initFunc(const FunctionData& rFuncData)
