loplugin:loopvartoosmall

Change-Id: Iafe55d4aa65a380d8d338edd54338f53a3e920dc

35 files changed, 305 insertions, 305 deletions

diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 863b217241af..b778086bee77 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -104,7 +104,7 @@ public:
 private:
 
     ScDocument* mpDoc;
-    long mnColumnCount;
+    SCCOL mnColumnCount;
 
     /**
      * All pivot table objects that references this cache.
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 889feb9b83ea..c9a12edbb634 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1831,7 +1831,7 @@ bool ScConditionalFormat::EqualEntries( const ScConditionalFormat& r ) const
         return false;
 
     //TODO: Test for same entries in reverse order?
-    for (sal_uInt16 i=0; i<size(); i++)
+    for (size_t i=0; i<size(); i++)
         if ( ! (maEntries == r.maEntries ) )
             return false;
 
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 2bdfa30e3160..5c094ad03009 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -1059,7 +1059,7 @@ void ScDocument::UpdateAreaLinks()
         return;
 
     const ::sfx2::SvBaseLinks& rLinks = pMgr->GetLinks();
-    for (sal_uInt16 i=0; i<rLinks.size(); i++)
+    for (size_t i=0; i<rLinks.size(); i++)
     {
         ::sfx2::SvBaseLink* pBase = *rLinks[i];
         if (pBase->ISA(ScAreaLink))
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index ffa721dbe0e9..ef27c121df93 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -348,7 +348,7 @@ void fillDateGroupDimension(
     // Now, populate the group items in the cache.
     rCache.ResetGroupItems(nGroupDim, rDateInfo, nDatePart);
 
-    for (sal_Int32 nValue = nStart; nValue <= nEnd; ++nValue)
+    for (long nValue = nStart; nValue <= nEnd; ++nValue)
         rCache.SetGroupItem(nGroupDim, ScDPItemData(nDatePart, nValue));
 
     // add first/last entry (min/max)
diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx
index ec47eab23690..eacff34252ff 100644
--- a/sc/source/core/data/dpfilteredcache.cxx
+++ b/sc/source/core/data/dpfilteredcache.cxx
@@ -311,7 +311,7 @@ void ScDPFilteredCache::filterTable(const vector<Criterion>& rCriteria, Sequence
                                  const std::unordered_set<sal_Int32>& rRepeatIfEmptyDims)
 {
     sal_Int32 nRowSize = getRowSize();
-    sal_Int32 nColSize = getColSize();
+    SCCOL nColSize = getColSize();
 
     if (!nRowSize)
         // no data to filter.
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 5b3a04fc4f98..044802eb63e4 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -902,7 +902,7 @@ void ScTable::SortReorderByColumn(
 
     // Cut formula grouping at row and reference boundaries before the reordering.
     ScRange aSortRange(nStart, nRow1, nTab, nLast, nRow2, nTab);
-    for (SCCOL nCol = nStart; nCol <= nLast; ++nCol)
+    for (SCCOL nCol = nStart; nCol <= (SCCOL)nLast; ++nCol)
         aCol[nCol].SplitFormulaGroupByRelativeRef(aSortRange);
 
     // Collect all listeners of cell broadcasters of sorted range.
@@ -911,7 +911,7 @@ void ScTable::SortReorderByColumn(
     if (!pArray->IsUpdateRefs())
     {
         // Collect listeners of cell broadcasters.
-        for (SCCOL nCol = nStart; nCol <= nLast; ++nCol)
+        for (SCCOL nCol = nStart; nCol <= (SCCOL)nLast; ++nCol)
             aCol[nCol].CollectListeners(aCellListeners, nRow1, nRow2);
 
         // Remove any duplicate listener entries.  We must ensure that we
@@ -952,7 +952,7 @@ void ScTable::SortReorderByColumn(
 
     // Reset formula cell positions which became out-of-sync after column reordering.
     bool bUpdateRefs = pArray->IsUpdateRefs();
-    for (SCCOL nCol = nStart; nCol <= nLast; ++nCol)
+    for (SCCOL nCol = nStart; nCol <= (SCCOL)nLast; ++nCol)
         aCol[nCol].ResetFormulaCellPositions(nRow1, nRow2, bUpdateRefs);
 
     if (pArray->IsUpdateRefs())
@@ -970,7 +970,7 @@ void ScTable::SortReorderByColumn(
         // Collect all listeners within sorted range ahead of time.
         std::vector<SvtListener*> aListeners;
 
-        for (SCCOL nCol = nStart; nCol <= nLast; ++nCol)
+        for (SCCOL nCol = nStart; nCol <= (SCCOL)nLast; ++nCol)
             aCol[nCol].CollectListeners(aListeners, nRow1, nRow2);
 
         // Get all area listeners that listen on one column within the range
@@ -1020,7 +1020,7 @@ void ScTable::SortReorderByColumn(
 
     // Re-join formulas at row boundaries now that all the references have
     // been adjusted for column reordering.
-    for (SCCOL nCol = nStart; nCol <= nLast; ++nCol)
+    for (SCCOL nCol = nStart; nCol <= (SCCOL)nLast; ++nCol)
     {
         sc::CellStoreType& rCells = aCol[nCol].maCells;
         sc::CellStoreType::position_type aPos = rCells.position(nRow1);
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index c82469b6a1c4..46025f922e0a 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -346,7 +346,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
 
         // fdo#39500 don't deduce increment from multiple equal list entries
         bool bAllSame = true;
-        for (sal_uInt16 i = 0; i < nCount; ++i)
+        for (SCSIZE i = 0; i < nCount; ++i)
         {
             OUString aTestStr;
             GetString(static_cast<SCCOL>(nCol + i* nAddX), static_cast<SCROW>(nRow + i * nAddY), aTestStr);
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 368c525a6d3b..d6c7ede891a9 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1030,7 +1030,7 @@ public:
                     ss << "}\n\t";
                 }
                 // The residual of mod outLoopSize
-                for (unsigned int count = nCurWindowSize / outLoopSize * outLoopSize; count < nCurWindowSize; count++)
+                for (size_t count = nCurWindowSize / outLoopSize * outLoopSize; count < nCurWindowSize; count++)
                 {
                     ss << "i = " << count << ";\n\t";
                     if (count == nCurWindowSize / outLoopSize * outLoopSize)
@@ -1073,7 +1073,7 @@ public:
                     ss << "}\n\t";
                 }
                 // The residual of mod outLoopSize
-                for (unsigned int count = nCurWindowSize / outLoopSize * outLoopSize; count < nCurWindowSize; count++)
+                for (size_t count = nCurWindowSize / outLoopSize * outLoopSize; count < nCurWindowSize; count++)
                 {
                     ss << "i = " << count << ";\n\t";
                     if (count == nCurWindowSize / outLoopSize * outLoopSize)
@@ -1675,7 +1675,7 @@ public:
     {
         ss << "\ndouble " << sSymName;
         ss << "_" << BinFuncName() << "(";
-        for (unsigned i = 0; i < vSubArguments.size(); i++)
+        for (size_t i = 0; i < vSubArguments.size(); i++)
         {
             if (i)
                 ss << ", ";
@@ -1792,7 +1792,7 @@ public:
         ss << "\ndouble " << sSymName;
         ss << "_" << BinFuncName() << "(";
         assert(vSubArguments.size() == 2);
-        for (unsigned i = 0; i < vSubArguments.size(); i++)
+        for (size_t i = 0; i < vSubArguments.size(); i++)
         {
             if (i)
                 ss << ", ";
@@ -1820,7 +1820,7 @@ public:
         const formula::DoubleVectorRefToken* pCurDVR = NULL;
         ss << "\ndouble " << sSymName;
         ss << "_" << BinFuncName() << "(";
-        for (unsigned i = 0; i < vSubArguments.size(); i++)
+        for (size_t i = 0; i < vSubArguments.size(); i++)
         {
             if (i)
                 ss << ",";
@@ -1859,7 +1859,7 @@ public:
                 ss << "i = outLoop*" << outLoopSize << "+" << count << ";\n";
                 if (count == 0)
                 {
-                    for (unsigned i = 0; i < vSubArguments.size(); i++)
+                    for (size_t i = 0; i < vSubArguments.size(); i++)
                     {
                         tmpCur = vSubArguments[i]->GetFormulaToken();
                         if (ocPush == tmpCur->GetOpCode())
@@ -1881,7 +1881,7 @@ public:
                     }
 
                     temp3 << "tmp = fsum(";
-                    for (unsigned i = 0; i < vSubArguments.size(); i++)
+                    for (size_t i = 0; i < vSubArguments.size(); i++)
                     {
                         if (i)
                             temp3 << "*";
@@ -1929,13 +1929,13 @@ public:
             ss << "}\n\t";
         }
         //The residual of mod outLoopSize
-        for (unsigned int count = nCurWindowSize / outLoopSize * outLoopSize;
+        for (size_t count = nCurWindowSize / outLoopSize * outLoopSize;
             count < nCurWindowSize; count++)
         {
             ss << "i =" << count << ";\n";
             if (count == nCurWindowSize / outLoopSize * outLoopSize)
             {
-                for (unsigned i = 0; i < vSubArguments.size(); i++)
+                for (size_t i = 0; i < vSubArguments.size(); i++)
                 {
                     tmpCur = vSubArguments[i]->GetFormulaToken();
                     if (ocPush == tmpCur->GetOpCode())
@@ -1957,7 +1957,7 @@ public:
                 }
 
                 temp4 << "tmp = fsum(";
-                for (unsigned i = 0; i < vSubArguments.size(); i++)
+                for (size_t i = 0; i < vSubArguments.size(); i++)
                 {
                     if (i)
                         temp4 << "*";
@@ -2417,13 +2417,13 @@ public:
 
     virtual void GenSlidingWindowFunction( std::stringstream& ss ) SAL_OVERRIDE
     {
-        for (unsigned i = 0; i < mvSubArguments.size(); i++)
+        for (size_t i = 0; i < mvSubArguments.size(); i++)
             mvSubArguments[i]->GenSlidingWindowFunction(ss);
         mpCodeGen->GenSlidingWindowFunction(ss, mSymName, mvSubArguments);
     }
     virtual void GenDeclRef( std::stringstream& ss ) const SAL_OVERRIDE
     {
-        for (unsigned i = 0; i < mvSubArguments.size(); i++)
+        for (size_t i = 0; i < mvSubArguments.size(); i++)
         {
             if (i)
                 ss << ",";
@@ -2444,7 +2444,7 @@ public:
     virtual size_t GetWindowSize() const SAL_OVERRIDE
     {
         size_t nCurWindowSize = 0;
-        for (unsigned i = 0; i < mvSubArguments.size(); i++)
+        for (size_t i = 0; i < mvSubArguments.size(); i++)
         {
             size_t nCurChildWindowSize = mvSubArguments[i]->GetWindowSize();
             nCurWindowSize = (nCurWindowSize < nCurChildWindowSize) ?
@@ -2472,7 +2472,7 @@ public:
         if (!nested)
         {
             ss << mSymName << "_" << mpCodeGen->BinFuncName() << "(";
-            for (unsigned i = 0; i < mvSubArguments.size(); i++)
+            for (size_t i = 0; i < mvSubArguments.size(); i++)
             {
                 if (i)
                     ss << ", ";
@@ -2503,7 +2503,7 @@ public:
     virtual std::string DumpOpName() const SAL_OVERRIDE
     {
         std::string t = "_" + mpCodeGen->BinFuncName();
-        for (unsigned i = 0; i < mvSubArguments.size(); i++)
+        for (size_t i = 0; i < mvSubArguments.size(); i++)
             t = t + mvSubArguments[i]->DumpOpName();
         return t;
     }
@@ -2511,7 +2511,7 @@ public:
         std::set<std::string>& funs ) const SAL_OVERRIDE
     {
         mpCodeGen->BinInlineFun(decls, funs);
-        for (unsigned i = 0; i < mvSubArguments.size(); i++)
+        for (size_t i = 0; i < mvSubArguments.size(); i++)
             mvSubArguments[i]->DumpInlineFun(decls, funs);
     }
     virtual ~DynamicKernelSoPArguments()
@@ -2593,7 +2593,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
 {
     size_t nChildren = ft->Children.size();
 
-    for (unsigned i = 0; i < nChildren; i++)
+    for (size_t i = 0; i < nChildren; i++)
     {
         FormulaTreeNodeRef rChild = ft->Children[i];
         if (!rChild)
diff --git a/sc/source/core/opencl/op_addin.cxx b/sc/source/core/opencl/op_addin.cxx
index 3bb7c6099ee4..76830c848616 100644
--- a/sc/source/core/opencl/op_addin.cxx
+++ b/sc/source/core/opencl/op_addin.cxx
@@ -27,7 +27,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -194,7 +194,7 @@ void OpGestep::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
diff --git a/sc/source/core/opencl/op_array.cxx b/sc/source/core/opencl/op_array.cxx
index b642c3b187ea..ef4d6c3c4cd1 100644
--- a/sc/source/core/opencl/op_array.cxx
+++ b/sc/source/core/opencl/op_array.cxx
@@ -27,7 +27,7 @@ void OpSumX2MY2::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -84,7 +84,7 @@ void OpSumX2PY2::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -140,7 +140,7 @@ void OpSumXMY2::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
diff --git a/sc/source/core/opencl/op_database.cxx b/sc/source/core/opencl/op_database.cxx
index 285da07002fa..6626e71282ca 100644
--- a/sc/source/core/opencl/op_database.cxx
+++ b/sc/source/core/opencl/op_database.cxx
@@ -25,7 +25,7 @@ void OpDmax::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -155,7 +155,7 @@ void OpDmin::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -286,7 +286,7 @@ void OpDproduct::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -415,7 +415,7 @@ void OpDaverage::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -549,7 +549,7 @@ void OpDstdev::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -734,7 +734,7 @@ void OpDstdevp::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -919,7 +919,7 @@ void OpDsum::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1049,7 +1049,7 @@ void OpDvar::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1234,7 +1234,7 @@ void OpDvarp::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1419,7 +1419,7 @@ void OpDcount::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1550,7 +1550,7 @@ void OpDcount2::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx
index 2e3c59fb6291..e7fc6c1be0b9 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -29,7 +29,7 @@ void RRI::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -99,7 +99,7 @@ vSubArguments)
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -110,7 +110,7 @@ vSubArguments)
     ss << "double temp = 0;\n\t";
     ss << "int gid0 = get_global_id(0);\n\t";
     ss << "double tmp0=0,tmp1=0;\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -158,7 +158,7 @@ void OpDollarde::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -209,7 +209,7 @@ void OpDollarfr::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -269,7 +269,7 @@ void OpDISC::GenSlidingWindowFunction(std::stringstream& ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -283,7 +283,7 @@ void OpDISC::GenSlidingWindowFunction(std::stringstream& ss,
     ss << "    double arg2 = " << GetBottom() << ";\n";
     ss << "    double arg3 = " << GetBottom() << ";\n";
     ss << "    double arg4 = " << GetBottom() << ";\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken* pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -340,7 +340,7 @@ void OpINTRATE::GenSlidingWindowFunction(std::stringstream& ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -354,7 +354,7 @@ void OpINTRATE::GenSlidingWindowFunction(std::stringstream& ss,
     ss << "    double arg2 = " << GetBottom() << ";\n";
     ss << "    double arg3 = " << GetBottom() << ";\n";
     ss << "    double arg4 = " << GetBottom() << ";\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken* pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -405,7 +405,7 @@ void OpFV::GenSlidingWindowFunction(std::stringstream& ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -455,7 +455,7 @@ void OpIPMT::GenSlidingWindowFunction(std::stringstream& ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -523,7 +523,7 @@ void OpISPMT::GenSlidingWindowFunction(std::stringstream& ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -536,7 +536,7 @@ void OpISPMT::GenSlidingWindowFunction(std::stringstream& ss,
     ss << "    double arg1 = " << GetBottom() << ";\n";
     ss << "    double arg2 = " << GetBottom() << ";\n";
     ss << "    double arg3 = " << GetBottom() << ";\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken* pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -577,7 +577,7 @@ void OpDuration::GenSlidingWindowFunction(std::stringstream& ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -589,7 +589,7 @@ void OpDuration::GenSlidingWindowFunction(std::stringstream& ss,
     ss << "    double arg0 = " << GetBottom() << ";\n";
     ss << "    double arg1 = " << GetBottom() << ";\n";
     ss << "    double arg2 = " << GetBottom() << ";\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken* pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -643,7 +643,7 @@ void OpDuration_ADD::GenSlidingWindowFunction(std::stringstream& ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -703,7 +703,7 @@ void OpMDuration::GenSlidingWindowFunction(std::stringstream& ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -718,7 +718,7 @@ void OpMDuration::GenSlidingWindowFunction(std::stringstream& ss,
     ss << "    double arg3 = " << GetBottom() << ";\n";
     ss << "    double arg4 = " << GetBottom() << ";\n";
     ss << "    double arg5 = " << GetBottom() << ";\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken* pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -766,7 +766,7 @@ void Fvschedule::GenSlidingWindowFunction(
     size_t nCurWindowSize = pCurDVR->GetRefRowSize();
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -804,7 +804,7 @@ vSubArguments)
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -918,7 +918,7 @@ void IRR::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1080,7 +1080,7 @@ void XNPV::GenSlidingWindowFunction(
     size_t nCurWindowSize = pCurDVR->GetRefRowSize();
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"( ";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1186,7 +1186,7 @@ void PriceMat::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1297,7 +1297,7 @@ void OpSYD::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1397,7 +1397,7 @@ void MIRR::GenSlidingWindowFunction(
 
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1455,7 +1455,7 @@ void OpEffective::GenSlidingWindowFunction(std::stringstream& ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1466,7 +1466,7 @@ void OpEffective::GenSlidingWindowFunction(std::stringstream& ss,
     ss << "    int gid0 = get_global_id(0);\n\t";
     ss << "    double arg0 = " << GetBottom() << ";\n";
     ss << "    double arg1 = " << GetBottom() << ";\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken* pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -1519,7 +1519,7 @@ void OpTbilleq::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1597,7 +1597,7 @@ void OpCumprinc::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1723,7 +1723,7 @@ void OpAccrint::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1837,7 +1837,7 @@ void OpAccrintm::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1964,7 +1964,7 @@ void OpYield::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2104,7 +2104,7 @@ void OpSLN::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2180,7 +2180,7 @@ void OpYieldmat::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2303,7 +2303,7 @@ void OpPMT::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ", ";
@@ -2367,7 +2367,7 @@ void OpNPV::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
       if (i)
           ss << ", ";
@@ -2497,7 +2497,7 @@ void OpPrice::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
       if (i)
           ss << ", ";
@@ -2573,7 +2573,7 @@ void OpOddlprice::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ", ";
@@ -2672,7 +2672,7 @@ void OpOddlyield::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ", ";
@@ -2775,7 +2775,7 @@ void OpPriceDisc::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ", ";
@@ -2837,7 +2837,7 @@ void OpNper::GenSlidingWindowFunction(std::stringstream &ss,
  {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
      if (i)
          ss << ", ";
@@ -2912,7 +2912,7 @@ void OpPPMT::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ", ";
@@ -3018,7 +3018,7 @@ vSubArguments)
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3109,7 +3109,7 @@ vSubArguments)
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
       if (i)
           ss << ",";
@@ -3195,7 +3195,7 @@ void OpCouppcd::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
       if (i)
           ss << ",";
@@ -3282,7 +3282,7 @@ vSubArguments)
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
       if (i)
           ss << ",";
@@ -3382,7 +3382,7 @@ void OpCoupdaysnc::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
       if (i)
           ss << ",";
@@ -3468,7 +3468,7 @@ void OpCoupnum::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
       if (i)
           ss << ",";
@@ -3547,7 +3547,7 @@ void OpAmordegrc::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
       if (i)
         ss << ",";
@@ -3695,7 +3695,7 @@ void OpAmorlinc::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3826,7 +3826,7 @@ void OpReceived::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3923,7 +3923,7 @@ void OpYielddisc::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4041,7 +4041,7 @@ void OpTbillprice::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4076,7 +4076,7 @@ void RATE::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4219,7 +4219,7 @@ void OpTbillyield::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4294,7 +4294,7 @@ void OpDDB::GenSlidingWindowFunction(std::stringstream& ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4395,7 +4395,7 @@ vSubArguments)
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4530,7 +4530,7 @@ void OpVDB::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4579,7 +4579,7 @@ void OpXirr::GenSlidingWindowFunction(std::stringstream &ss,
     pCurDVR->GetRefRowSize() ;
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4691,7 +4691,7 @@ void OpDB::GenSlidingWindowFunction(std::stringstream& ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
diff --git a/sc/source/core/opencl/op_logical.cxx b/sc/source/core/opencl/op_logical.cxx
index 405ddc683914..a057cf0c1911 100644
--- a/sc/source/core/opencl/op_logical.cxx
+++ b/sc/source/core/opencl/op_logical.cxx
@@ -26,7 +26,7 @@ void OpAnd::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -35,7 +35,7 @@ void OpAnd::GenSlidingWindowFunction(std::stringstream &ss,
     ss << ") {\n";
     ss << "    int gid0 = get_global_id(0);\n";
     ss << "    double t = 1,tmp=0;\n";
-    for(unsigned int j = 0; j< vSubArguments.size(); j++)
+    for(size_t j = 0; j< vSubArguments.size(); j++)
     {
         ss << "    double tmp"<<j<<" = 1;\n";
         FormulaToken *tmpCur0 = vSubArguments[j]->GetFormulaToken();
@@ -111,7 +111,7 @@ void OpOr::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -120,7 +120,7 @@ void OpOr::GenSlidingWindowFunction(std::stringstream &ss,
     ss << ") {\n";
     ss << "    int gid0 = get_global_id(0);\n";
     ss << "    double t = 0,tmp=0;\n";
-    for(unsigned int j = 0; j< vSubArguments.size(); j++)
+    for(size_t j = 0; j< vSubArguments.size(); j++)
     {
         ss << "    double tmp"<<j<<" = 0;\n";
         FormulaToken *tmpCur0 = vSubArguments[j]->GetFormulaToken();
@@ -190,7 +190,7 @@ void OpNot::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -227,7 +227,7 @@ void OpXor::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -237,7 +237,7 @@ void OpXor::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "    int gid0 = get_global_id(0);\n";
     ss << "    int t = 0,tmp0 = 0;\n";
     ss << "    double tmp = 0;\n";
-    for(unsigned int j = 0; j< vSubArguments.size(); j++)
+    for(size_t j = 0; j< vSubArguments.size(); j++)
     {
         FormulaToken *tmpCur0 = vSubArguments[j]->GetFormulaToken();
         if(tmpCur0->GetType() == formula::svSingleVectorRef)
@@ -306,7 +306,7 @@ void OpIf::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx
index 221474d37a6d..b6525f25cd81 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -28,7 +28,7 @@ void OpCos::GenSlidingWindowFunction(std::stringstream &ss,
 {
         ss << "\ndouble " << sSymName;
         ss << "_"<< BinFuncName() <<"(";
-        for (unsigned i = 0; i < vSubArguments.size(); i++)
+        for (size_t i = 0; i < vSubArguments.size(); i++)
         {
             if (i) ss << ",";
             vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -79,7 +79,7 @@ void OpSec::GenSlidingWindowFunction(std::stringstream &ss,
           formula::SingleVectorRefToken *>(tmpCur);
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -110,7 +110,7 @@ void OpSecH::GenSlidingWindowFunction(std::stringstream &ss,
           formula::SingleVectorRefToken *>(tmpCur);
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -132,7 +132,7 @@ void OpMROUND::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ", ";
@@ -193,7 +193,7 @@ void OpCosh::GenSlidingWindowFunction(std::stringstream &ss,
           formula::SingleVectorRefToken *>(tmpCur);
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -217,7 +217,7 @@ void OpCot::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -278,7 +278,7 @@ void OpCoth::GenSlidingWindowFunction(std::stringstream &ss,
           formula::SingleVectorRefToken *>(tmpCur);
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -309,7 +309,7 @@ void OpCombinA::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -319,7 +319,7 @@ void OpCombinA::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "    int gid0 = get_global_id(0);\n";
     ss << "    double tem;\n";
     ss << "    double arg0,arg1;\n";
-    for (unsigned int i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -366,7 +366,7 @@ void OpEven::GenSlidingWindowFunction(std::stringstream &ss,
           formula::SingleVectorRefToken *>(tmpCur);
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -397,7 +397,7 @@ void OpMod::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -431,7 +431,7 @@ void OpLog::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -441,7 +441,7 @@ void OpLog::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "    int gid0 = get_global_id(0);\n";
     ss << "    double tem;\n";
     ss << "    double arg0,arg1;\n";
-    for (unsigned int i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -482,7 +482,7 @@ void OpCsc::GenSlidingWindowFunction(
           formula::SingleVectorRefToken *>(tmpCur);
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -511,7 +511,7 @@ void OpCountIfs::GenSlidingWindowFunction(std::stringstream &ss,
     pCurDVR->GetRefRowSize() ;
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -528,7 +528,7 @@ void OpCountIfs::GenSlidingWindowFunction(std::stringstream &ss,
 
      std::stringstream tmpss;
 
-     for(unsigned j=0;j<vSubArguments.size();j+=2,m++)
+     for(size_t j=0;j<vSubArguments.size();j+=2,m++)
      {
         CheckSubArgumentIsNan(tmpss,vSubArguments,j);
         CheckSubArgumentIsNan(ss,vSubArguments,j+1);
@@ -541,7 +541,7 @@ void OpCountIfs::GenSlidingWindowFunction(std::stringstream &ss,
         tmpss << ")){\n";
      }
     tmpss << "    tmp ++;\n";
-    for(unsigned j=0;j<vSubArguments.size();j+=2,m--)
+    for(size_t j=0;j<vSubArguments.size();j+=2,m--)
      {
          for(int n = 0;n<m+1;n++)
         {
@@ -572,7 +572,7 @@ void OpSumIfs::GenSlidingWindowFunction(std::stringstream &ss,
         ss << "__kernel void ";
         ss << vSubArguments[0]->GetName();
         ss << "_SumIfs_reduction(  ";
-        for (unsigned i = 0; i < vSubArguments.size(); i++)
+        for (size_t i = 0; i < vSubArguments.size(); i++)
         {
             if (i)
                 ss << ",";
@@ -608,7 +608,7 @@ void OpSumIfs::GenSlidingWindowFunction(std::stringstream &ss,
         int mm=0;
         std::string p1 = "p1";
         std::string p2 = "p2";
-        for(unsigned j=1;j<vSubArguments.size();j+=2,mm++)
+        for(size_t j=1;j<vSubArguments.size();j+=2,mm++)
         {
             CheckSubArgumentIsNan2(ss,vSubArguments,j,p1);
             CheckSubArgumentIsNan2(ss,vSubArguments,j+1,p1);
@@ -624,7 +624,7 @@ void OpSumIfs::GenSlidingWindowFunction(std::stringstream &ss,
         }
         CheckSubArgumentIsNan2(ss,vSubArguments,0,p1);
         ss << "    tmp += tmp0;\n";
-        for(unsigned j=1;j<vSubArguments.size();j+=2,mm--)
+        for(size_t j=1;j<vSubArguments.size();j+=2,mm--)
         {
             for(int n = 0;n<mm+1;n++)
             {
@@ -633,7 +633,7 @@ void OpSumIfs::GenSlidingWindowFunction(std::stringstream &ss,
             ss<< "}\n\n";
         }
         mm=0;
-        for(unsigned j=1;j<vSubArguments.size();j+=2,mm++)
+        for(size_t j=1;j<vSubArguments.size();j+=2,mm++)
         {
             CheckSubArgumentIsNan2(ss,vSubArguments,j,p2);
             CheckSubArgumentIsNan2(ss,vSubArguments,j+1,p2);
@@ -647,7 +647,7 @@ void OpSumIfs::GenSlidingWindowFunction(std::stringstream &ss,
         }
         CheckSubArgumentIsNan2(ss,vSubArguments,0,p2);
         ss << "    tmp += tmp0;\n";
-        for(unsigned j=1;j< vSubArguments.size();j+=2,mm--)
+        for(size_t j=1;j< vSubArguments.size();j+=2,mm--)
         {
             for(int n = 0;n<mm+1;n++)
             {
@@ -659,7 +659,7 @@ void OpSumIfs::GenSlidingWindowFunction(std::stringstream &ss,
 
         ss << "    else if (p1 < min(arrayLength, offset + windowSize)) {\n";
         mm=0;
-        for(unsigned j=1;j<vSubArguments.size();j+=2,mm++)
+        for(size_t j=1;j<vSubArguments.size();j+=2,mm++)
         {
             CheckSubArgumentIsNan2(ss,vSubArguments,j,p1);
             CheckSubArgumentIsNan2(ss,vSubArguments,j+1,p1);
@@ -674,7 +674,7 @@ void OpSumIfs::GenSlidingWindowFunction(std::stringstream &ss,
         }
         CheckSubArgumentIsNan2(ss,vSubArguments,0,p1);
         ss << "    tmp += tmp0;\n";
-        for(unsigned j=1;j<vSubArguments.size();j+=2,mm--)
+        for(size_t j=1;j<vSubArguments.size();j+=2,mm--)
         {
             for(int n = 0;n<mm+1;n++)
             {
@@ -703,7 +703,7 @@ void OpSumIfs::GenSlidingWindowFunction(std::stringstream &ss,
     // generate functions as usual
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -734,7 +734,7 @@ void OpSumIfs::GenSlidingWindowFunction(std::stringstream &ss,
         }
         ss<< "    int singleIndex =gid0;\n";
         int m=0;
-        for(unsigned j=1;j<vSubArguments.size();j+=2,m++)
+        for(size_t j=1;j<vSubArguments.size();j+=2,m++)
         {
             CheckSubArgumentIsNan(ss,vSubArguments,j);
             CheckSubArgumentIsNan(ss,vSubArguments,j+1);
@@ -748,7 +748,7 @@ void OpSumIfs::GenSlidingWindowFunction(std::stringstream &ss,
         }
         CheckSubArgumentIsNan(ss,vSubArguments,0);
         ss << "    tmp += tmp0;\n";
-        for(unsigned j=1;j<=vSubArguments.size();j+=2,m--)
+        for(size_t j=1;j<=vSubArguments.size();j+=2,m--)
         {
             for(int n = 0;n<m+1;n++)
             {
@@ -774,7 +774,7 @@ void OpCscH::GenSlidingWindowFunction(
           formula::SingleVectorRefToken *>(tmpCur);
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -797,7 +797,7 @@ void OpExp::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -851,7 +851,7 @@ void OpAverageIfs::GenSlidingWindowFunction(std::stringstream &ss,
     pCurDVR->GetRefRowSize() ;
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -866,7 +866,7 @@ void OpAverageIfs::GenSlidingWindowFunction(std::stringstream &ss,
      ss<< "    int singleIndex =gid0;\n";
      int m=0;
      std::stringstream tmpss;
-     for(unsigned j=1;j<vSubArguments.size();j+=2,m++)
+     for(size_t j=1;j<vSubArguments.size();j+=2,m++)
      {
         CheckSubArgumentIsNan(tmpss,vSubArguments,j);
         CheckSubArgumentIsNan(ss,vSubArguments,j+1);
@@ -881,7 +881,7 @@ void OpAverageIfs::GenSlidingWindowFunction(std::stringstream &ss,
      CheckSubArgumentIsNan(tmpss,vSubArguments,0);
     tmpss << "    tmp += tmp0;\n";
     tmpss << "    count++;\n";
-    for(unsigned j=1;j<vSubArguments.size();j+=2,m--)
+    for(size_t j=1;j<vSubArguments.size();j+=2,m--)
      {
          for(int n = 0;n<m+1;n++)
         {
@@ -908,7 +908,7 @@ void OpLog10::GenSlidingWindowFunction(std::stringstream &ss,
           formula::SingleVectorRefToken *>(tmpCur);
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -932,7 +932,7 @@ void OpSinh::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -954,7 +954,7 @@ void OpSin::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -1003,7 +1003,7 @@ void OpAbs::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1039,7 +1039,7 @@ void OpArcCos::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -1065,7 +1065,7 @@ void OpArcCosHyp::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -1108,7 +1108,7 @@ void OpTan::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -1159,7 +1159,7 @@ void OpTanH::GenSlidingWindowFunction(std::stringstream &ss,
           formula::SingleVectorRefToken *>(tmpCur);
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1183,7 +1183,7 @@ void OpPower::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1193,7 +1193,7 @@ void OpPower::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "{\n";
     ss << "    int gid0=get_global_id(0);\n";
     ss << "    double arg[2];\n";
-    for( unsigned i=0; i < vSubArguments.size(); ++i)
+    for( size_t i=0; i < vSubArguments.size(); ++i)
     {
         FormulaToken *tmpCur = vSubArguments[i]->GetFormulaToken();
         assert(tmpCur);
@@ -1251,7 +1251,7 @@ void OpSqrt::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1300,7 +1300,7 @@ void OpArcCot::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -1325,7 +1325,7 @@ void OpArcCotHyp::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -1379,7 +1379,7 @@ void OpArcSin::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -1404,7 +1404,7 @@ void OpArcSinHyp::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -1452,7 +1452,7 @@ void OpArcTan2::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -1487,7 +1487,7 @@ void OpArcTan::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -1534,7 +1534,7 @@ void OpArcTanH::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -1561,7 +1561,7 @@ void OpBitAnd::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -1596,7 +1596,7 @@ void OpLn::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1619,7 +1619,7 @@ void OpRound::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1649,7 +1649,7 @@ void OpRoundUp::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1687,7 +1687,7 @@ void OpRoundDown::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1720,7 +1720,7 @@ void OpInt::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1743,7 +1743,7 @@ void OpNegSub::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1763,7 +1763,7 @@ void OpRadians::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1784,7 +1784,7 @@ void OpIsEven::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1805,7 +1805,7 @@ void OpIsOdd::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1831,7 +1831,7 @@ void OpOdd::GenSlidingWindowFunction(
     ss << Math_Intg_Str;
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1970,7 +1970,7 @@ void OpSumIf::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
     int flag = 3 == vSubArguments.size() ? 2 : 0;
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2089,7 +2089,7 @@ void OpTrunc::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2099,7 +2099,7 @@ void OpTrunc::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "{\n";
     ss << "    int gid0=get_global_id(0);\n";
     ss << "    double arg[2];\n";
-    for( unsigned i=0; i < vSubArguments.size(); ++i)
+    for( size_t i=0; i < vSubArguments.size(); ++i)
     {
         FormulaToken *tmpCur = vSubArguments[i]->GetFormulaToken();
         assert(tmpCur);
@@ -2167,7 +2167,7 @@ void OpFloor::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2202,7 +2202,7 @@ void OpBitOr::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -2239,7 +2239,7 @@ void OpBitXor::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -2277,7 +2277,7 @@ void OpBitLshift::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -2317,7 +2317,7 @@ void OpBitRshift::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -2359,7 +2359,7 @@ void OpSumSQ::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); ++i)
+    for (size_t i = 0; i < vSubArguments.size(); ++i)
     {
         if (i)
             ss << ",";
@@ -2369,7 +2369,7 @@ void OpSumSQ::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "{\n";
     ss << "    int gid0=get_global_id(0);\n";
     ss << "    double sum = 0.0f, arg;\n";
-    for( unsigned i=0; i < vSubArguments.size(); ++i)
+    for( size_t i=0; i < vSubArguments.size(); ++i)
     {
         FormulaToken *tmpCur = vSubArguments[i]->GetFormulaToken();
         assert(tmpCur);
@@ -2449,7 +2449,7 @@ void OpSqrtPi::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2499,7 +2499,7 @@ void OpCeil::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -2558,7 +2558,7 @@ void OpCombin::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -2665,7 +2665,7 @@ void OpConvert::GenSlidingWindowFunction(
         formula::SingleVectorRefToken *>(tmpCur);
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2710,7 +2710,7 @@ void OpProduct::GenSlidingWindowFunction(std::stringstream &ss,
 {
        ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"( ";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2720,7 +2720,7 @@ void OpProduct::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "    int gid0 = get_global_id(0);\n";
     ss << "    int i = 0;\n";
     ss << "    double product=1.0;\n\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -2783,7 +2783,7 @@ void OpAverageIf::GenSlidingWindowFunction(std::stringstream &ss,
 
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -2940,7 +2940,7 @@ void OpDeg::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2990,7 +2990,7 @@ void OpFact::GenSlidingWindowFunction(std::stringstream& ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3052,7 +3052,7 @@ void OpQuotient::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i) ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
@@ -3080,7 +3080,7 @@ void OpSeriesSum::GenSlidingWindowFunction(std::stringstream &ss,
     if( vSubArguments.size() != 4){return;}
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
diff --git a/sc/source/core/opencl/op_spreadsheet.cxx b/sc/source/core/opencl/op_spreadsheet.cxx
index d9809ef9bf63..3b0646062795 100644
--- a/sc/source/core/opencl/op_spreadsheet.cxx
+++ b/sc/source/core/opencl/op_spreadsheet.cxx
@@ -27,7 +27,7 @@ void OpVLookup::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
diff --git a/sc/source/core/opencl/op_statistical.cxx b/sc/source/core/opencl/op_statistical.cxx
index 6e38f843eed0..fcfb774874fc 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -27,7 +27,7 @@ void OpVar::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -214,7 +214,7 @@ void OpZTest::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -474,7 +474,7 @@ void OpTTest::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -799,7 +799,7 @@ void OpVarP::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -997,7 +997,7 @@ void OpTDist::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1131,7 +1131,7 @@ void OpExponDist::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1221,7 +1221,7 @@ void OpFdist::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1285,7 +1285,7 @@ void OpStandard::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1410,7 +1410,7 @@ void OpWeibull::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1572,7 +1572,7 @@ void OpSkew::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -1829,7 +1829,7 @@ void OpSkewp::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2114,7 +2114,7 @@ void OpTInv::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2212,7 +2212,7 @@ void OpStDev::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2386,7 +2386,7 @@ void OpStDevP::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2562,7 +2562,7 @@ void OpSlope::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2722,9 +2722,9 @@ void OpSTEYX::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
-    if (i)
+        if (i)
             ss << ",";
         vSubArguments[i]->GenSlidingWindowDecl(ss);
     }
@@ -2880,7 +2880,7 @@ vSubArguments)
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2934,7 +2934,7 @@ void OpFisherInv::GenSlidingWindowFunction(
           formula::SingleVectorRefToken *>(tmpCur);
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2958,7 +2958,7 @@ void OpGamma::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -2992,7 +2992,7 @@ void OpCorrel::GenSlidingWindowFunction(
 
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3175,7 +3175,7 @@ void OpNegbinomdist::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3256,7 +3256,7 @@ void OpPearson::GenSlidingWindowFunction(
 
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3337,7 +3337,7 @@ void OpGammaLn::GenSlidingWindowFunction(
 formula::SingleVectorRefToken *>(tmpCur);
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3370,7 +3370,7 @@ vSubArguments)
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3419,7 +3419,7 @@ void OpGeoMean::GenSlidingWindowFunction(
 {
     ss << "__kernel void ";
     ss << "GeoMean_reduction(  ";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3443,7 +3443,7 @@ void OpGeoMean::GenSlidingWindowFunction(
     ss << "    int offset;\n";
     ss << "    barrier(CLK_LOCAL_MEM_FENCE);\n";
 
-    for(unsigned i=0;i<vSubArguments.size();i++)
+    for(size_t i=0;i<vSubArguments.size();i++)
     {
         assert(vSubArguments[i]->GetFormulaToken());
 
@@ -3564,7 +3564,7 @@ void OpGeoMean::GenSlidingWindowFunction(
 
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3587,7 +3587,7 @@ vSubArguments)
 
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"( ";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3600,7 +3600,7 @@ vSubArguments)
     ss << "    double tmp = 0;\n";
     ss << "    int length;\n";
     ss << "    int totallength=0;\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -3670,7 +3670,7 @@ void OpConfidence::GenSlidingWindowFunction(std::stringstream& ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3745,7 +3745,7 @@ void OpCritBinom::GenSlidingWindowFunction(std::stringstream& ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3861,7 +3861,7 @@ void OpRsq::GenSlidingWindowFunction(
 
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -3957,7 +3957,7 @@ void OpChiInv::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4041,7 +4041,7 @@ void OpNormdist::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4119,7 +4119,7 @@ void OpNormsdist::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4177,7 +4177,7 @@ void OpPermut::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
        if (i)
          ss << ",";
@@ -4242,7 +4242,7 @@ void OpPermutationA::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
        if (i)
          ss << ",";
@@ -4291,7 +4291,7 @@ void OpPhi::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4349,7 +4349,7 @@ void OpNorminv::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4564,7 +4564,7 @@ void OpNormsinv:: GenSlidingWindowFunction
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4776,7 +4776,7 @@ void OpMedian::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4789,7 +4789,7 @@ void OpMedian::GenSlidingWindowFunction(
     ss << "    unsigned int startFlag = 0;\n";
     ss << "    unsigned int endFlag = 0;\n";
     ss << "    double dataIna;\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -4840,7 +4840,7 @@ void OpKurt:: GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"( ";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -4854,7 +4854,7 @@ void OpKurt:: GenSlidingWindowFunction(std::stringstream &ss,
     ss << "    double length;\n";
     ss << "    double totallength=0;\n";
     ss << "    double tmp = 0;\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -4907,7 +4907,7 @@ void OpKurt:: GenSlidingWindowFunction(std::stringstream &ss,
         }
     }
     ss << "    double fMean = fSum * pow(totallength,-1);\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -4952,7 +4952,7 @@ void OpKurt:: GenSlidingWindowFunction(std::stringstream &ss,
     ss << "    double fStdDev = sqrt(vSum / (totallength - 1.0));\n";
     ss << "    double dx = 0.0;\n";
     ss << "    double xpower4 = 0.0;\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
         assert(pCur);
@@ -5012,7 +5012,7 @@ void OpIntercept::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -5173,7 +5173,7 @@ void OpLogInv:: GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -5421,7 +5421,7 @@ void OpForecast::GenSlidingWindowFunction(std::stringstream &ss,
     size_t nCurWindowSize1 = pCurDVR2->GetRefRowSize();
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"( ";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -5531,7 +5531,7 @@ void OpLogNormDist::GenSlidingWindowFunction(std::stringstream &ss,
         formula::SingleVectorRefToken *>(tmpCur3);
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -5645,7 +5645,7 @@ void OpGammaDist::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -5740,7 +5740,7 @@ void OpChiDist::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -5850,7 +5850,7 @@ void OpBinomdist::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -6005,7 +6005,7 @@ vSubArguments)
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -6097,7 +6097,7 @@ vSubArguments)
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -6181,7 +6181,7 @@ void OpGammaInv::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -6374,7 +6374,7 @@ void OpFInv::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -6569,7 +6569,7 @@ void OpFTest::GenSlidingWindowFunction(std::stringstream &ss,
     size_t nCurWindowSize1 = pCurDVR1->GetRefRowSize();
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"( ";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -6586,7 +6586,7 @@ void OpFTest::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "    int length1= "<<nCurWindowSize1;
     ss << ";\n";
     ss << "    double tmp = 0;\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         FormulaToken *pCurSub = vSubArguments[i]->GetFormulaToken();
         assert(pCurSub);
@@ -6659,7 +6659,7 @@ void OpB::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -6815,7 +6815,7 @@ void OpPoisson::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -6930,7 +6930,7 @@ void OpCovar::GenSlidingWindowFunction(std::stringstream& ss,
 {
         ss << "\ndouble " << sSymName;
         ss << "_"<< BinFuncName() <<"(";
-        for (unsigned i = 0; i < vSubArguments.size(); i++)
+        for (size_t i = 0; i < vSubArguments.size(); i++)
         {
             if (i)
                 ss << ",";
@@ -7142,7 +7142,7 @@ void OpCovar::GenSlidingWindowFunction(std::stringstream& ss,
         }
         else {
         ss << "    int cnt0 = 0,cnt1 = 0;\n";
-        for (unsigned i = 0; i < vSubArguments.size(); i++)
+        for (size_t i = 0; i < vSubArguments.size(); i++)
         {
             FormulaToken* pCur = vSubArguments[i]->GetFormulaToken();
             if (pCur->GetType() == formula::svSingleVectorRef){
@@ -7175,7 +7175,7 @@ void OpCovar::GenSlidingWindowFunction(std::stringstream& ss,
         }
         ss << "        vMean0 = vSum0 / cnt0;\n";
         ss << "        vMean1 = vSum0 / cnt1;\n";
-        for(unsigned i = 0; i < vSubArguments.size(); i++ ) {
+        for(size_t i = 0; i < vSubArguments.size(); i++ ) {
             FormulaToken* pCur = vSubArguments[i]->GetFormulaToken();
             if (pCur->GetType() == formula::svSingleVectorRef) {
                 const formula::SingleVectorRefToken* pTVR =
@@ -7209,7 +7209,7 @@ void OpBetaDist::GenSlidingWindowFunction(std::stringstream &ss,
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -7342,7 +7342,7 @@ void OpBetainv::GenSlidingWindowFunction(
 {
     ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -7434,7 +7434,7 @@ void OpDevSq::GenSlidingWindowFunction(std::stringstream& ss,
 {
         ss << "\ndouble " << sSymName;
         ss << "_"<< BinFuncName() <<"(";
-        for (unsigned i = 0; i < vSubArguments.size(); i++)
+        for (size_t i = 0; i < vSubArguments.size(); i++)
         {
             if (i)
                 ss << ",";
@@ -7445,7 +7445,7 @@ void OpDevSq::GenSlidingWindowFunction(std::stringstream& ss,
         ss << "    double vSum = 0.0;\n";
         ss << "    double vMean = 0.0;\n";
         ss << "    int cnt = 0;\n";
-        for(unsigned i = 0; i < vSubArguments.size(); i++ )
+        for(size_t i = 0; i < vSubArguments.size(); i++ )
         {
         ss << "    double arg" << i << " = 0.0;\n";
         FormulaToken* pCur = vSubArguments[i]->GetFormulaToken();
@@ -7538,7 +7538,7 @@ void OpDevSq::GenSlidingWindowFunction(std::stringstream& ss,
             }
         ss << "    vMean = vSum / cnt;\n";
         ss << "    vSum = 0.0;\n";
-        for(unsigned k = 0; k < vSubArguments.size(); k++ )
+        for(size_t k = 0; k < vSubArguments.size(); k++ )
         {
         FormulaToken* pCur = vSubArguments[k]->GetFormulaToken();
         if (pCur->GetType() == formula::svDoubleVectorRef)
diff --git a/sc/source/core/opencl/opbase.cxx b/sc/source/core/opencl/opbase.cxx
index b2a77a438a1d..f1d7b21203cd 100644
--- a/sc/source/core/opencl/opbase.cxx
+++ b/sc/source/core/opencl/opbase.cxx
@@ -189,7 +189,7 @@ void Normal::GenSlidingWindowFunction(
     ArgVector argVector;
     ss << "\ndouble " << sSymName;
     ss << "_" << BinFuncName() << "(";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         if (i)
             ss << ",";
@@ -209,7 +209,7 @@ void Normal::GenSlidingWindowFunction(
 void CheckVariables::GenTmpVariables(
     std::stringstream& ss, SubArguments& vSubArguments )
 {
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         ss << "    double tmp";
         ss << i;
@@ -312,7 +312,7 @@ void CheckVariables::CheckAllSubArgumentIsNan(
     std::stringstream& ss, SubArguments& vSubArguments )
 {
     ss << "    int k = gid0;\n";
-    for (unsigned i = 0; i < vSubArguments.size(); i++)
+    for (size_t i = 0; i < vSubArguments.size(); i++)
     {
         CheckSubArgumentIsNan(ss, vSubArguments, i);
     }
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index 1e0a5f5d6c59..5192f46fd129 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -252,7 +252,7 @@ ScFormulaCfg::PropsToIds ScFormulaCfg::GetPropNamesToId()
     };
     OSL_ENSURE( SAL_N_ELEMENTS(aVals) == aPropNames.getLength(), "Properties and ids are out of Sync");
     PropsToIds aPropIdMap;
-    for ( sal_uInt16 i=0; i<aPropNames.getLength(); ++i )
+    for ( sal_Int32 i=0; i<aPropNames.getLength(); ++i )
         aPropIdMap[aPropNames[i]] = aVals[ i ];
     return aPropIdMap;
 }
diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxx
index 1d61024b3877..afe8d475f9e3 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.cxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.cxx
@@ -129,7 +129,7 @@ void ScXMLExportDDELinks::WriteDDELinks(uno::Reference<sheet::XSpreadsheetDocume
             if (nCount)
             {
                 SvXMLElementExport aElemDDEs(rExport, XML_NAMESPACE_TABLE, XML_DDE_LINKS, true, true);
-                for (sal_uInt16 nDDELink = 0; nDDELink < nCount; ++nDDELink)
+                for (sal_Int32 nDDELink = 0; nDDELink < nCount; ++nDDELink)
                 {
                     uno::Reference<sheet::XDDELink> xDDELink(xIndex->getByIndex(nDDELink), uno::UNO_QUERY);
                     if (xDDELink.is())
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 8c87f9fb22f4..10231fb0a4ef 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -982,7 +982,7 @@ OUString* ScFormatRangeStyles::GetStyleNameByIndex(const sal_Int32 nIndex, const
 void ScFormatRangeStyles::Sort()
 {
     sal_Int32 nTables = aTables.size();
-    for (sal_Int16 i = 0; i < nTables; ++i)
+    for (sal_Int32 i = 0; i < nTables; ++i)
         if (!aTables[i]->empty())
             aTables[i]->sort();
 }
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 3ddd5bfe618a..3fb893f37502 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -491,7 +491,7 @@ sal_Int32 ScXMLExport::GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const
     return itr->second;
 }
 
-void ScXMLExport::CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount)
+void ScXMLExport::CollectSharedData(SCTAB& nTableCount, sal_Int32& nShapesCount)
 {
     if (!GetModel().is())
         return;
@@ -579,7 +579,7 @@ void ScXMLExport::CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCo
     }
 }
 
-void ScXMLExport::CollectShapesAutoStyles(const sal_Int32 nTableCount)
+void ScXMLExport::CollectShapesAutoStyles(SCTAB nTableCount)
 {
     // #i84077# To avoid compiler warnings about uninitialized aShapeItr,
     // it's initialized using this dummy list. The iterator contains shapes
@@ -653,14 +653,14 @@ void ScXMLExport::CollectShapesAutoStyles(const sal_Int32 nTableCount)
 void ScXMLExport::_ExportMeta()
 {
     sal_Int32 nCellCount(pDoc ? pDoc->GetCellCount() : 0);
-    sal_Int32 nTableCount(0);
+    SCTAB nTableCount(0);
     sal_Int32 nShapesCount(0);
     GetAutoStylePool()->ClearEntries();
     CollectSharedData(nTableCount, nShapesCount);
 
     uno::Sequence<beans::NamedValue> stats(3);
     stats[0] = beans::NamedValue(OUString("TableCount"),
-                uno::makeAny(nTableCount));
+                uno::makeAny((sal_Int32)nTableCount));
     stats[1] = beans::NamedValue(OUString("CellCount"),
                 uno::makeAny(nCellCount));
     stats[2] = beans::NamedValue(OUString("ObjectCount"),
@@ -1800,7 +1800,7 @@ void ScXMLExport::_ExportContent()
     nCurrentTable = 0;
     if (!pSharedData)
     {
-        sal_Int32 nTableCount(0);
+        SCTAB nTableCount(0);
         sal_Int32 nShapesCount(0);
         CollectSharedData(nTableCount, nShapesCount);
         OSL_FAIL("no shared data setted");
@@ -1892,7 +1892,7 @@ void ScXMLExport::_ExportStyles( bool bUsed )
 {
     if (!pSharedData)
     {
-        sal_Int32 nTableCount(0);
+        SCTAB nTableCount(0);
         sal_Int32 nShapesCount(0);
         CollectSharedData(nTableCount, nShapesCount);
     }
@@ -2455,7 +2455,7 @@ void ScXMLExport::_ExportAutoStyles()
 
         if (!pSharedData)
         {
-            sal_Int32 nTableCount(0);
+            SCTAB nTableCount(0);
             sal_Int32 nShapesCount(0);
             CollectSharedData(nTableCount, nShapesCount);
         }
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index e4630b44122f..32ce760590a6 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -133,8 +133,8 @@ class ScXMLExport : public SvXMLExport
     bool                        mbShowProgress;
 
     sal_Int32       GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const;
-    void            CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount);
-    void            CollectShapesAutoStyles(const sal_Int32 nTableCount);
+    void            CollectSharedData(SCTAB& nTableCount, sal_Int32& nShapesCount);
+    void            CollectShapesAutoStyles(SCTAB nTableCount);
     void            WriteTablesView(const com::sun::star::uno::Any& aTableView);
     void            WriteView(const com::sun::star::uno::Any& aView);
     virtual void _ExportFontDecls() SAL_OVERRIDE;
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 17cc747984a9..09cc0b48060e 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -357,7 +357,7 @@ void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem )
 
        // get all snapping points:
        std::set< sal_uInt16 > aTmpSnappingPoints;
-       for ( sal_uInt16 j = 0; j < rSnappingPoints.getLength(); ++j )
+       for ( sal_Int32 j = 0; j < rSnappingPoints.getLength(); ++j )
        {
            const sal_Int32 nSnappingPoint = rSnappingPoints[j];
            aTmpSnappingPoints.insert( (sal_uInt16)nSnappingPoint );
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 5ffac4434adf..3a3cf7a53e6a 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -863,7 +863,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
             SCSIZE nCount = theQueryData.GetEntryCount();
             if (maRefreshExceptQuery.size() < nCount + 1)
                 maRefreshExceptQuery.resize(nCount + 1, false);
-            for (sal_uInt16 i = nOffset; i < nCount; ++i)
+            for (SCSIZE i = nOffset; i < nCount; ++i)
             {
                 theQueryData.GetEntry(i).bDoQuery = false;
                 maRefreshExceptQuery[i] = false;
@@ -910,7 +910,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
             SCSIZE nCount = theQueryData.GetEntryCount();
             if (maRefreshExceptQuery.size() < nCount)
                 maRefreshExceptQuery.resize(nCount, false);
-            for (sal_uInt16 i= nTemp; i< nCount; i++)
+            for (SCSIZE i= nTemp; i< nCount; i++)
             {
                 theQueryData.GetEntry(i).bDoQuery = false;
                 maRefreshExceptQuery[i] = false;
@@ -950,7 +950,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
             SCSIZE nCount = theQueryData.GetEntryCount();
             if (maRefreshExceptQuery.size() < nCount)
                 maRefreshExceptQuery.resize(nCount, false);
-            for (sal_uInt16 i = nTemp; i < nCount; ++i)
+            for (SCSIZE i = nTemp; i < nCount; ++i)
             {
                 theQueryData.GetEntry(i).bDoQuery = false;
                 maRefreshExceptQuery[i] = false;
@@ -982,7 +982,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
             SCSIZE nCount = theQueryData.GetEntryCount();
             if (maRefreshExceptQuery.size() < nCount)
                 maRefreshExceptQuery.resize(nCount, false);
-            for (sal_uInt16 i = nTemp; i < nCount; ++i)
+            for (SCSIZE i = nTemp; i < nCount; ++i)
             {
                 theQueryData.GetEntry(i).bDoQuery = false;
                 maRefreshExceptQuery[i] = false;
diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx
index 883bd09d1357..6c1e32333bf5 100644
--- a/sc/source/ui/docshell/pagedata.cxx
+++ b/sc/source/ui/docshell/pagedata.cxx
@@ -97,7 +97,7 @@ bool ScPageBreakData::operator==( const ScPageBreakData& rOther ) const
     if ( nUsed != rOther.nUsed )
         return false;
 
-    for (sal_uInt16 i=0; i<nUsed; i++)
+    for (size_t i=0; i<nUsed; i++)
         if ( pData[i].GetPrintRange() != rOther.pData[i].GetPrintRange() )
             return false;
 
@@ -111,7 +111,7 @@ void ScPageBreakData::AddPages()
     if ( nUsed > 1 )
     {
         long nPage = pData[0].GetFirstPage();
-        for (sal_uInt16 i=0; sal::static_int_cast<size_t>(i+1)<nUsed; i++)
+        for (size_t i=0; i+1<nUsed; i++)
         {
             nPage += ((long)pData[i].GetPagesX())*pData[i].GetPagesY();
             pData[i+1].SetFirstPage( nPage );
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index db8d941a90b4..d7950c8de266 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -291,7 +291,7 @@ void ScUndoDeleteTab::SetChangeTrack()
         nStartChangeAction = pChangeTrack->GetActionMax() + 1;
         nEndChangeAction = 0;
         ScRange aRange( 0, 0, 0, MAXCOL, MAXROW, 0 );
-        for ( unsigned int i = 0; i < theTabs.size(); ++i )
+        for ( size_t i = 0; i < theTabs.size(); ++i )
         {
             aRange.aStart.SetTab( theTabs[i] );
             aRange.aEnd.SetTab( theTabs[i] );
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 50ad9ec5e90b..29343a1f3d2e 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1612,7 +1612,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
                 lang::EventObject aEvent;
                 aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
-                for ( sal_uInt16 n=0; n<aValueListeners.size(); n++ )
+                for ( size_t n=0; n<aValueListeners.size(); n++ )
                     aValueListeners[n]->disposing( aEvent );
 
                 aValueListeners.clear();
@@ -1642,7 +1642,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
                 // the EventObject holds a Ref to this object until after the listener calls
 
                 ScDocument& rDoc = pDocShell->GetDocument();
-                for ( sal_uInt16 n=0; n<aValueListeners.size(); n++ )
+                for ( size_t n=0; n<aValueListeners.size(); n++ )
                     rDoc.AddUnoListenerCall( aValueListeners[n], aEvent );
 
                 bGotDataChangedHint = false;
@@ -4533,7 +4533,7 @@ static bool lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries,
 
     if ( !rNamedEntries.empty() )
     {
-        for ( sal_uInt16 n=0; n<rNamedEntries.size(); n++ )
+        for ( size_t n=0; n<rNamedEntries.size(); n++ )
             if ( rNamedEntries[n].GetName() == rName )
             {
                 //  test if named entry is contained in rRanges
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 72b19665bd0a..903d10a85db1 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2857,7 +2857,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
 
                 if( m_pDocument )
                 {
-                    for ( sal_uInt16 n=0; n<m_aValueListeners.size(); n++ )
+                    for ( size_t n=0; n<m_aValueListeners.size(); n++ )
                         m_pDocument->AddUnoListenerCall( m_aValueListeners[n], aEvent );
                 }
 
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index fccb164a672f..22719a585c3c 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1376,7 +1376,7 @@ void ScDataPilotTableObj::Refreshed_Impl()
     // the EventObject holds a Ref to this object until after the listener calls
 
     ScDocument& rDoc = GetDocShell()->GetDocument();
-    for ( sal_uInt16 n=0; n<aModifyListeners.size(); n++ )
+    for ( size_t n=0; n<aModifyListeners.size(); n++ )
         rDoc.AddUnoListenerCall( aModifyListeners[n], aEvent );
 }
 
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 0401547b8725..32941b01b38b 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -1964,7 +1964,7 @@ void ScDatabaseRangeObj::Refreshed_Impl()
 {
     lang::EventObject aEvent;
     aEvent.Source = (cppu::OWeakObject*)this;
-    for ( sal_uInt16 n=0; n<aRefreshListeners.size(); n++ )
+    for ( size_t n=0; n<aRefreshListeners.size(); n++ )
         aRefreshListeners[n]->refreshed( aEvent );
 }
 
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index 6afd072b986a..d0d694daaf07 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -124,7 +124,7 @@ uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL
     uno::Sequence< uno::Reference< frame::XDispatch> > aReturn(aDescripts.getLength());
     uno::Reference< frame::XDispatch>* pReturn = aReturn.getArray();
     const frame::DispatchDescriptor* pDescripts = aDescripts.getConstArray();
-    for (sal_Int16 i=0; i<aDescripts.getLength(); ++i, ++pReturn, ++pDescripts)
+    for (sal_Int32 i=0; i<aDescripts.getLength(); ++i, ++pReturn, ++pDescripts)
     {
         *pReturn = queryDispatch(pDescripts->FeatureURL,
                 pDescripts->FrameName, pDescripts->SearchFlags);
@@ -361,7 +361,7 @@ void SAL_CALL ScDispatch::selectionChanged( const ::com::sun::star::lang::EventO
 
             lcl_FillDataSource( aEvent, aNewImport );       // modifies State, IsEnabled
 
-            for ( sal_uInt16 n=0; n<aDataSourceListeners.size(); n++ )
+            for ( size_t n=0; n<aDataSourceListeners.size(); n++ )
                 aDataSourceListeners[n]->statusChanged( aEvent );
 
             aLastImport = aNewImport;
@@ -380,7 +380,7 @@ void SAL_CALL ScDispatch::disposing( const ::com::sun::star::lang::EventObject&
 
     lang::EventObject aEvent;
     aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
-    for ( sal_uInt16 n=0; n<aDataSourceListeners.size(); n++ )
+    for ( size_t n=0; n<aDataSourceListeners.size(); n++ )
         aDataSourceListeners[n]->disposing( aEvent );
 
     pViewShell = NULL;
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index d22ec1031b2d..bcb4c3546b0b 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -1997,7 +1997,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet
         // There is no data to show.  Bail out.
         return;
 
-    sal_Int32 nColSize = aTabData[0].getLength();
+    SCCOL nColSize = aTabData[0].getLength();
 
     SCTAB nNewTab = GetViewData().GetTabNo();
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 38d4560fa794..0c7a5d312e19 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -6095,7 +6095,7 @@ void ScGridWindow::UpdateCursorOverlay()
             std::vector< basegfx::B2DRange > aRanges;
             const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
 
-            for(sal_uInt32 a(0); a < aPixelRects.size(); a++)
+            for(size_t a(0); a < aPixelRects.size(); a++)
             {
                 const Rectangle aRA(aPixelRects[a]);
                 basegfx::B2DRange aRB(aRA.Left(), aRA.Top(), aRA.Right() + 1, aRA.Bottom() + 1);
@@ -6151,7 +6151,7 @@ void ScGridWindow::UpdateSelectionOverlay()
             SCTAB nTab = pViewData->GetTabNo();
             bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 
-            for(sal_uInt32 a(0); a < aPixelRects.size(); a++)
+            for(size_t a(0); a < aPixelRects.size(); a++)
             {
                 const Rectangle aRA(aPixelRects[a]);
                 if (bLayoutRTL)
@@ -6383,7 +6383,7 @@ void ScGridWindow::UpdateDragRectOverlay()
             std::vector< basegfx::B2DRange > aRanges;
             const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
 
-            for(sal_uInt32 a(0); a < aPixelRects.size(); a++)
+            for(size_t a(0); a < aPixelRects.size(); a++)
             {
                 const Rectangle aRA(aPixelRects[a]);
                 basegfx::B2DRange aRB(aRA.Left(), aRA.Top(), aRA.Right() + 1, aRA.Bottom() + 1);
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 35cce45a02f7..7fc665929904 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -384,7 +384,7 @@ void ScTabViewShell::UpdateNumberFormatter(
     {
         const sal_uInt32* pDelArr = rInfoItem.GetDelArray();
 
-        for ( sal_uInt16 i=0; i<nDelCount; i++ )
+        for ( sal_uInt32 i=0; i<nDelCount; i++ )
             rInfoItem.GetNumberFormatter()->DeleteEntry( pDelArr[i] );
     }
 }
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 47b0ace1ccef..3fe6ade40744 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2202,7 +2202,7 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord )
         SCTAB nCount = rDoc.GetTableCount();
 
         OUString aOldName;
-        for(unsigned int i=0; i<TheTabs.size(); ++i)
+        for(size_t i=0; i<TheTabs.size(); ++i)
         {
             SCTAB nTab = TheTabs[i];
             if (i==0)
@@ -2615,7 +2615,7 @@ void ScViewFunc::MoveTable(
             nDestTab=pDestDoc->GetTableCount();
         SCTAB nDestTab1=nDestTab;
         ScClipParam aParam;
-        for( sal_uInt16 j=0; j<TheTabs.size(); ++j, ++nDestTab1 )
+        for( size_t j=0; j<TheTabs.size(); ++j, ++nDestTab1 )
         {   // insert sheets first and update all references
             OUString aName;
             if (bRename)
@@ -2636,7 +2636,7 @@ void ScViewFunc::MoveTable(
         if ( nErrVal > 0 )
         {
             nDestTab1 = nDestTab;
-            for(sal_uInt16 i=0; i<TheTabs.size();++i)
+            for(size_t i=0; i<TheTabs.size();++i)
             {
                 nErrVal = pDestShell->TransferTab( *pDocShell, TheTabs[i], static_cast<SCTAB>(nDestTab1), false, false );
                 nDestTab1++;