[Libreoffice-commits] core.git: Branch 'feature/calc-parallel' - sc/source

[Dennis Francis]

Rebased ref, commits from common ancestor:
commit 59b501be351d03e3bc0d6283dfb8d3341c0e224d
Author: Dennis Francis <dennis.francis at collabora.co.uk>
Date:   Tue Nov 21 12:11:01 2017 +0530

    fix some problems pointed out by loplugin
    
    Change-Id: I864384942621355acd263f1cf09f21610459bee2

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index f4fb466f836b..329f1afa5034 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1738,15 +1738,11 @@ void ScFormulaCell::Interpret()
 namespace {
 class StackCleaner
 {
-    ScInterpreter*  pInt;
+    std::unique_ptr<ScInterpreter>  pInt;
     public:
     StackCleaner( ScInterpreter* pI )
         : pInt(pI)
         {}
-    ~StackCleaner()
-    {
-        delete pInt;
-    }
 };
 }
 
@@ -4291,7 +4287,7 @@ struct ScDependantsCalculator
             }
         }
 
-        for (auto i = 0u; i < aRangeList.size(); ++i)
+        for (size_t i = 0; i < aRangeList.size(); ++i)
         {
             const ScRange* pRange = aRangeList[i];
             assert(pRange->aStart.Tab() == pRange->aEnd.Tab());
diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index 3acc38d68051..f6565e732086 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -377,7 +377,7 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument& rDoc, const ScAddres
         }
         SCROW nRemaining = nLen - nBatchSize * nThreadCount;
 
-        SAL_INFO("sc.swipret.threaded", "Running " << nThreadCount << " threads");
+        SAL_INFO("sc.threaded", "Running " << nThreadCount << " threads");
 
         SCROW nLeft = nLen;
         SCROW nStart = 0;
@@ -393,9 +393,9 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument& rDoc, const ScAddres
             nLeft -= nCount;
             nStart = nLast + 1;
         }
-        SAL_INFO("sc.swipret.threaded", "Joining threads");
+        SAL_INFO("sc.threaded", "Joining threads");
         rThreadPool.waitUntilDone(aTag);
-        SAL_INFO("sc.swipret.threaded", "Done");
+        SAL_INFO("sc.threaded", "Done");
     }
     else
     {