[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source

[Eike Rathke]

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

New commits:
commit 23514c32eef813b23cae99df709fe74882f90bef
Author: Eike Rathke <er...@redhat.com>
Date:   Thu Jun 8 21:27:20 2017 +0200

    With reference lists there can be more than 255 queries
    
    (cherry picked from commit c479912ffc48e1db1671333f09c041a081c600a3)
    
     Conflicts:
            sc/source/core/tool/interpr1.cxx
    
    Backported.
    
    Change-Id: Ia5dc32fbcd8ad738d5ec0f20cc233b58fcadc882
    Reviewed-on: https://gerrit.libreoffice.org/38583
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Eike Rathke <er...@redhat.com>

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index a9d4a36cd8c2..c27e4c2ede86 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5309,7 +5309,7 @@ void ScInterpreter::IterateParametersIfs( 
sc::ParamIfsResult& rRes )
     sal_uInt8 nParamCount = GetByte();
     sal_uInt8 nQueryCount = nParamCount / 2;
 
-    std::vector<sal_uInt8> aResArray;
+    std::vector<sal_uInt32> aResArray;
     size_t nRowSize = 0;
     size_t nColSize = 0;
     double fVal = 0.0;
@@ -5522,7 +5522,7 @@ void ScInterpreter::IterateParametersIfs( 
sc::ParamIfsResult& rRes )
                     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;
@@ -5635,7 +5635,7 @@ void ScInterpreter::IterateParametersIfs( 
sc::ParamIfsResult& rRes )
                     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)
                 {
@@ -5662,7 +5662,7 @@ void ScInterpreter::IterateParametersIfs( 
sc::ParamIfsResult& rRes )
             }
             else
             {
-                std::vector<sal_uInt8>::const_iterator itRes = 
aResArray.begin();
+                std::vector<sal_uInt32>::const_iterator itRes = 
aResArray.begin();
                 for (size_t nCol = 0; nCol < nColSize; ++nCol)
                 {
                     for (size_t nRow = 0; nRow < nRowSize; ++nRow, ++itRes)
@@ -5696,7 +5696,7 @@ void ScInterpreter::IterateParametersIfs( 
sc::ParamIfsResult& rRes )
     }
     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)
                 ++rRes.mfCount;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits