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

[Takeshi Abe]

 sc/source/core/data/formulacell.cxx    |    2 +-
 sc/source/core/inc/arraysumfunctor.hxx |    2 +-
 sc/source/core/tool/formulagroup.cxx   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 615c269325e476c5994ec46029b5928a8064ed78
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Thu Jun 14 18:24:26 2018 +0900

    sc: These booleans are constant
    
    Change-Id: Ib5098cc38ca9fecfcf2d57e59573253b714f2df4
    Reviewed-on: https://gerrit.libreoffice.org/55785
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 40f5cbbd3ba6..4aca388c2f6e 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -4425,7 +4425,7 @@ bool ScFormulaCell::InterpretFormulaGroup()
             return false;
         }
 
-        static bool bHyperThreadingActive = tools::cpuid::hasHyperThreading();
+        const static bool bHyperThreadingActive = tools::cpuid::hasHyperThreading();
 
         // Then do the threaded calculation
 
diff --git a/sc/source/core/inc/arraysumfunctor.hxx b/sc/source/core/inc/arraysumfunctor.hxx
index 13f69d9cf62a..86f346f89834 100644
--- a/sc/source/core/inc/arraysumfunctor.hxx
+++ b/sc/source/core/inc/arraysumfunctor.hxx
@@ -43,7 +43,7 @@ public:
 
     double operator() ()
     {
-        static bool hasSSE2 = tools::cpuid::hasSSE2();
+        const static bool hasSSE2 = tools::cpuid::hasSSE2();
 
         double fSum = 0.0;
         size_t i = 0;
diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index b494d25d1146..a000b641d322 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -337,7 +337,7 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument& rDoc, const ScAddres
     // The caller must ensure that the top position is the start position of
     // the group.
 
-    static bool bHyperThreadingActive = tools::cpuid::hasHyperThreading();
+    const static bool bHyperThreadingActive = tools::cpuid::hasHyperThreading();
     ScAddress aTmpPos = rTopPos;
     std::vector<formula::FormulaConstTokenRef> aResults(xGroup->mnLength);