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

Eike Rathke erack at redhat.com
Thu Jun 8 19:28:27 UTC 2017


 sc/source/core/tool/interpr1.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c479912ffc48e1db1671333f09c041a081c600a3
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Jun 8 21:27:20 2017 +0200

    With reference lists there can be more than 255 queries
    
    Change-Id: Ia5dc32fbcd8ad738d5ec0f20cc233b58fcadc882

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index be8769ad9aed..c000be49b55c 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_uInt8> aResArray;
+    std::vector<sal_uInt32> aResArray;
     double fVal = 0.0;
     SCCOL nDimensionCols = 0;
     SCROW nDimensionRows = 0;
@@ -5854,7 +5854,7 @@ void ScInterpreter::IterateParametersIfs( double(*ResultFunc)( const sc::ParamIf
                     return;
                 }
 
-                std::vector<sal_uInt8>::iterator itRes = aResArray.begin(), itResEnd = aResArray.end();
+                std::vector<sal_uInt32>::iterator itRes = aResArray.begin(), itResEnd = aResArray.end();
                 std::vector<double>::const_iterator itThisRes = aResValues.begin();
                 for (; itRes != itResEnd; ++itRes, ++itThisRes)
                     *itRes += *itThisRes;
@@ -5973,7 +5973,7 @@ void ScInterpreter::IterateParametersIfs( double(*ResultFunc)( const sc::ParamIf
                     return;
                 }
 
-                std::vector<sal_uInt8>::const_iterator itRes = aResArray.begin(), itResEnd = aResArray.end();
+                std::vector<sal_uInt32>::const_iterator itRes = aResArray.begin(), itResEnd = aResArray.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_uInt8>::const_iterator itRes = aResArray.begin();
+                std::vector<sal_uInt32>::const_iterator itRes = aResArray.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_uInt8>::const_iterator itRes = aResArray.begin(), itResEnd = aResArray.end();
+        std::vector<sal_uInt32>::const_iterator itRes = aResArray.begin(), itResEnd = aResArray.end();
         for (; itRes != itResEnd; ++itRes)
             if (*itRes == nQueryCount)
                 ++aRes.mfCount;


More information about the Libreoffice-commits mailing list