sc/source/core/tool/interpr1.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
New commits: commit 691d1e90f62ce3f1930d3faf74af385d92f00d59 Author: Eike Rathke <er...@redhat.com> Date: Fri Jun 9 00:43:44 2017 +0200 Too many aRes..., rename aResArray to vConditions Change-Id: Ic514a4fe34b2f9658bae61ecb4cc5c3c8361669b diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index c000be49b55c..180d1400127f 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -5638,7 +5638,7 @@ void ScInterpreter::IterateParametersIfs( double(*ResultFunc)( const sc::ParamIf sal_uInt8 nQueryCount = nParamCount / 2; sc::ParamIfsResult aRes; - std::vector<sal_uInt32> aResArray; + std::vector<sal_uInt32> vConditions; double fVal = 0.0; SCCOL nDimensionCols = 0; SCROW nDimensionRows = 0; @@ -5805,8 +5805,8 @@ void ScInterpreter::IterateParametersIfs( double(*ResultFunc)( const sc::ParamIf } // initialize temporary result matrix - if (aResArray.empty()) - aResArray.resize( nDimensionCols * nDimensionRows, 0); + if (vConditions.empty()) + vConditions.resize( nDimensionCols * nDimensionRows, 0); ScQueryParam rParam; rParam.nRow1 = nRow1; @@ -5848,13 +5848,13 @@ void ScInterpreter::IterateParametersIfs( double(*ResultFunc)( const sc::ParamIf // result matrix is filled with boolean values. std::vector<double> aResValues; pResultMatrix->GetDoubleArray(aResValues); - if (aResArray.size() != aResValues.size()) + if (vConditions.size() != aResValues.size()) { PushError( FormulaError::IllegalParameter); return; } - std::vector<sal_uInt32>::iterator itRes = aResArray.begin(), itResEnd = aResArray.end(); + std::vector<sal_uInt32>::iterator itRes = vConditions.begin(), itResEnd = vConditions.end(); std::vector<double>::const_iterator itThisRes = aResValues.begin(); for (; itRes != itResEnd; ++itRes, ++itThisRes) *itRes += *itThisRes; @@ -5870,7 +5870,7 @@ void ScInterpreter::IterateParametersIfs( double(*ResultFunc)( const sc::ParamIf { size_t nC = aCellIter.GetCol() + nColDiff; size_t nR = aCellIter.GetRow() + nRowDiff; - ++aResArray[nC * nDimensionRows + nR]; + ++vConditions[nC * nDimensionRows + nR]; } while ( aCellIter.GetNext() ); } } @@ -5967,13 +5967,13 @@ void ScInterpreter::IterateParametersIfs( double(*ResultFunc)( const sc::ParamIf { std::vector<double> aMainValues; pMainMatrix->GetDoubleArray(aMainValues, false); // Map empty values to NaN's. - if (aResArray.size() != aMainValues.size()) + if (vConditions.size() != aMainValues.size()) { PushError( FormulaError::IllegalArgument); return; } - std::vector<sal_uInt32>::const_iterator itRes = aResArray.begin(), itResEnd = aResArray.end(); + std::vector<sal_uInt32>::const_iterator itRes = vConditions.begin(), itResEnd = vConditions.end(); std::vector<double>::const_iterator itMain = aMainValues.begin(); for (; itRes != itResEnd; ++itRes, ++itMain) { @@ -6000,7 +6000,7 @@ void ScInterpreter::IterateParametersIfs( double(*ResultFunc)( const sc::ParamIf } else { - std::vector<sal_uInt32>::const_iterator itRes = aResArray.begin(); + std::vector<sal_uInt32>::const_iterator itRes = vConditions.begin(); for (SCCOL nCol = 0; nCol < nDimensionCols; ++nCol) { for (SCROW nRow = 0; nRow < nDimensionRows; ++nRow, ++itRes) @@ -6034,7 +6034,7 @@ void ScInterpreter::IterateParametersIfs( double(*ResultFunc)( const sc::ParamIf } else { - std::vector<sal_uInt32>::const_iterator itRes = aResArray.begin(), itResEnd = aResArray.end(); + std::vector<sal_uInt32>::const_iterator itRes = vConditions.begin(), itResEnd = vConditions.end(); for (; itRes != itResEnd; ++itRes) if (*itRes == nQueryCount) ++aRes.mfCount; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits