diff options
Diffstat (limited to 'sc/qa')
-rw-r--r-- | sc/qa/unit/helper/qahelper.hxx | 4 | ||||
-rw-r--r-- | sc/qa/unit/ucalc.cxx | 4 | ||||
-rw-r--r-- | sc/qa/unit/ucalc.hxx | 8 | ||||
-rw-r--r-- | sc/qa/unit/ucalc_formula.cxx | 28 | ||||
-rw-r--r-- | sc/qa/unit/ucalc_pivottable.cxx | 10 |
5 files changed, 27 insertions, 27 deletions
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index 083e2d107676..0d089cedf26f 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -138,8 +138,8 @@ SCQAHELPER_DLLPUBLIC ScTokenArray* compileFormula( ScDocument* pDoc, const OUString& rFormula, const ScAddress* pPos = nullptr, formula::FormulaGrammar::Grammar eGram = formula::FormulaGrammar::GRAM_NATIVE ); -template<size_t _Size> -bool checkOutput(ScDocument* pDoc, const ScRange& aOutRange, const char* aOutputCheck[][_Size], const char* pCaption) +template<size_t Size> +bool checkOutput(ScDocument* pDoc, const ScRange& aOutRange, const char* aOutputCheck[][Size], const char* pCaption) { bool bResult = true; const ScAddress& s = aOutRange.aStart; diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index f46cd76808ff..d10ac5bbdff5 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -1014,8 +1014,8 @@ struct HoriIterCheck const char* pVal; }; -template<size_t _Size> -bool checkHorizontalIterator(ScDocument* pDoc, const char* pData[][_Size], size_t nDataCount, const HoriIterCheck* pChecks, size_t nCheckCount) +template<size_t Size> +bool checkHorizontalIterator(ScDocument* pDoc, const char* pData[][Size], size_t nDataCount, const HoriIterCheck* pChecks, size_t nCheckCount) { ScAddress aPos(0,0,0); Test::insertRangeData(pDoc, aPos, pData, nDataCount); diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx index 9c930169041f..9427367ca6a6 100644 --- a/sc/qa/unit/ucalc.hxx +++ b/sc/qa/unit/ucalc.hxx @@ -58,17 +58,17 @@ public: static void setCalcAsShown(ScDocument* pDoc, bool bCalcAsShown); - template<size_t _Size> + template<size_t Size> static ScRange insertRangeData( - ScDocument* pDoc, const ScAddress& rPos, const char* aData[][_Size], size_t nRowCount ) + ScDocument* pDoc, const ScAddress& rPos, const char* aData[][Size], size_t nRowCount ) { ScRange aRange(rPos); - aRange.aEnd.SetCol(rPos.Col()+_Size-1); + aRange.aEnd.SetCol(rPos.Col()+Size-1); aRange.aEnd.SetRow(rPos.Row()+nRowCount-1); clearRange(pDoc, aRange); - for (size_t i = 0; i < _Size; ++i) + for (size_t i = 0; i < Size; ++i) { for (size_t j = 0; j < nRowCount; ++j) { diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index cf1944b6eaf2..a58ec4d34d99 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -4425,14 +4425,14 @@ struct StrStrCheck { const char* pRes; }; -template<size_t _DataSize, size_t _FormulaSize, int _Type> -void runTestMATCH(ScDocument* pDoc, const char* aData[_DataSize], StrStrCheck aChecks[_FormulaSize]) +template<size_t DataSize, size_t FormulaSize, int Type> +void runTestMATCH(ScDocument* pDoc, const char* aData[DataSize], StrStrCheck aChecks[FormulaSize]) { - size_t nDataSize = _DataSize; + size_t nDataSize = DataSize; for (size_t i = 0; i < nDataSize; ++i) pDoc->SetString(0, i, 0, OUString::createFromAscii(aData[i])); - for (size_t i = 0; i < _FormulaSize; ++i) + for (size_t i = 0; i < FormulaSize; ++i) { pDoc->SetString(1, i, 0, OUString::createFromAscii(aChecks[i].pVal)); @@ -4442,17 +4442,17 @@ void runTestMATCH(ScDocument* pDoc, const char* aData[_DataSize], StrStrCheck aC aBuf.append(";A1:A"); aBuf.append(static_cast<sal_Int32>(nDataSize)); aBuf.append(";"); - aBuf.append(static_cast<sal_Int32>(_Type)); + aBuf.append(static_cast<sal_Int32>(Type)); aBuf.append(")"); OUString aFormula = aBuf.makeStringAndClear(); pDoc->SetString(2, i, 0, aFormula); } pDoc->CalcAll(); - Test::printRange(pDoc, ScRange(0, 0, 0, 2, _FormulaSize-1, 0), "MATCH"); + Test::printRange(pDoc, ScRange(0, 0, 0, 2, FormulaSize-1, 0), "MATCH"); // verify the results. - for (size_t i = 0; i < _FormulaSize; ++i) + for (size_t i = 0; i < FormulaSize; ++i) { OUString aStr = pDoc->GetString(2, i, 0); if (!aStr.equalsAscii(aChecks[i].pRes)) @@ -4464,14 +4464,14 @@ void runTestMATCH(ScDocument* pDoc, const char* aData[_DataSize], StrStrCheck aC } } -template<size_t _DataSize, size_t _FormulaSize, int _Type> -void runTestHorizontalMATCH(ScDocument* pDoc, const char* aData[_DataSize], StrStrCheck aChecks[_FormulaSize]) +template<size_t DataSize, size_t FormulaSize, int Type> +void runTestHorizontalMATCH(ScDocument* pDoc, const char* aData[DataSize], StrStrCheck aChecks[FormulaSize]) { - size_t nDataSize = _DataSize; + size_t nDataSize = DataSize; for (size_t i = 0; i < nDataSize; ++i) pDoc->SetString(i, 0, 0, OUString::createFromAscii(aData[i])); - for (size_t i = 0; i < _FormulaSize; ++i) + for (size_t i = 0; i < FormulaSize; ++i) { pDoc->SetString(i, 1, 0, OUString::createFromAscii(aChecks[i].pVal)); @@ -4482,17 +4482,17 @@ void runTestHorizontalMATCH(ScDocument* pDoc, const char* aData[_DataSize], StrS aBuf.append("2;A1:"); aBuf.append(static_cast<sal_Unicode>('A'+nDataSize)); aBuf.append("1;"); - aBuf.append(static_cast<sal_Int32>(_Type)); + aBuf.append(static_cast<sal_Int32>(Type)); aBuf.append(")"); OUString aFormula = aBuf.makeStringAndClear(); pDoc->SetString(i, 2, 0, aFormula); } pDoc->CalcAll(); - Test::printRange(pDoc, ScRange(0, 0, 0, _FormulaSize-1, 2, 0), "MATCH"); + Test::printRange(pDoc, ScRange(0, 0, 0, FormulaSize-1, 2, 0), "MATCH"); // verify the results. - for (size_t i = 0; i < _FormulaSize; ++i) + for (size_t i = 0; i < FormulaSize; ++i) { OUString aStr = pDoc->GetString(i, 2, 0); if (!aStr.equalsAscii(aChecks[i].pRes)) diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx index ef1150587d7e..c8aa1b3930cf 100644 --- a/sc/qa/unit/ucalc_pivottable.cxx +++ b/sc/qa/unit/ucalc_pivottable.cxx @@ -41,8 +41,8 @@ struct DPFieldDef bool bRepeatItemLabels; }; -template<size_t _Size> -ScRange insertDPSourceData(ScDocument* pDoc, DPFieldDef aFields[], size_t nFieldCount, const char* aData[][_Size], size_t nDataCount) +template<size_t Size> +ScRange insertDPSourceData(ScDocument* pDoc, DPFieldDef aFields[], size_t nFieldCount, const char* aData[][Size], size_t nDataCount) { // Insert field names in row 0. for (size_t i = 0; i < nFieldCount; ++i) @@ -72,10 +72,10 @@ ScRange insertDPSourceData(ScDocument* pDoc, DPFieldDef aFields[], size_t nField return aSrcRange; } -template<size_t _Size> -bool checkDPTableOutput(ScDocument* pDoc, const ScRange& aOutRange, const char* aOutputCheck[][_Size], const char* pCaption) +template<size_t Size> +bool checkDPTableOutput(ScDocument* pDoc, const ScRange& aOutRange, const char* aOutputCheck[][Size], const char* pCaption) { - return checkOutput<_Size>(pDoc, aOutRange, aOutputCheck, pCaption); + return checkOutput<Size>(pDoc, aOutRange, aOutputCheck, pCaption); } ScDPObject* createDPFromSourceDesc( |