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

[Tor Lillqvist]

 sc/source/core/tool/calcconfig.cxx |   70 +++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 34 deletions(-)

New commits:
commit 41931af38f27885670267c221f87852b64f19ffe
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Sep 16 12:03:19 2015 +0300

    Use C++11 initializer list
    
    Change-Id: Ibb46bfa9bf641a2c1a71bbd15d702520cb7a485b
    (cherry picked from commit 18c092dd9ca752c88bcbab9ed5877c6a1e78b805)

diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx
index 868ddd1..d5c1907 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -33,46 +33,48 @@ ScCalcConfig::ScCalcConfig() :
 
 void ScCalcConfig::setOpenCLConfigToDefault()
 {
+    // Keep in order of opcode value, is that clearest? (Random order,
+    // at least, would make no sense at all.)
+    static const OpCodeSet aDefaultOpenCLSubsetOpCodes {
+        ocAdd,
+        ocSub,
+        ocMul,
+        ocDiv,
+        ocRandom,
+        ocSin,
+        ocCos,
+        ocTan,
+        ocArcTan,
+        ocExp,
+        ocLn,
+        ocSqrt,
+        ocStdNormDist,
+        ocSNormInv,
+        ocRound,
+        ocPower,
+        ocSumProduct,
+        ocMin,
+        ocMax,
+        ocSum,
+        ocProduct,
+        ocAverage,
+        ocCount,
+        ocVar,
+        ocNormDist,
+        ocVLookup,
+        ocCorrel,
+        ocCovar,
+        ocPearson,
+        ocSlope,
+        ocSumIfs};
+
     // Note that these defaults better be kept in sync with those in
     // officecfg/registry/schema/org/openoffice/Office/Calc.xcs.
     // Crazy.
     mbOpenCLSubsetOnly = true;
     mbOpenCLAutoSelect = true;
     mnOpenCLMinimumFormulaGroupSize = 100;
-
-    // Keep in order of opcode value, is that clearest? (Random order,
-    // at least, would make no sense at all.)
-    maOpenCLSubsetOpCodes.insert(ocAdd);
-    maOpenCLSubsetOpCodes.insert(ocSub);
-    maOpenCLSubsetOpCodes.insert(ocMul);
-    maOpenCLSubsetOpCodes.insert(ocDiv);
-    maOpenCLSubsetOpCodes.insert(ocRandom);
-    maOpenCLSubsetOpCodes.insert(ocSin);
-    maOpenCLSubsetOpCodes.insert(ocCos);
-    maOpenCLSubsetOpCodes.insert(ocTan);
-    maOpenCLSubsetOpCodes.insert(ocArcTan);
-    maOpenCLSubsetOpCodes.insert(ocExp);
-    maOpenCLSubsetOpCodes.insert(ocLn);
-    maOpenCLSubsetOpCodes.insert(ocSqrt);
-    maOpenCLSubsetOpCodes.insert(ocStdNormDist);
-    maOpenCLSubsetOpCodes.insert(ocSNormInv);
-    maOpenCLSubsetOpCodes.insert(ocRound);
-    maOpenCLSubsetOpCodes.insert(ocPower);
-    maOpenCLSubsetOpCodes.insert(ocSumProduct);
-    maOpenCLSubsetOpCodes.insert(ocMin);
-    maOpenCLSubsetOpCodes.insert(ocMax);
-    maOpenCLSubsetOpCodes.insert(ocSum);
-    maOpenCLSubsetOpCodes.insert(ocProduct);
-    maOpenCLSubsetOpCodes.insert(ocAverage);
-    maOpenCLSubsetOpCodes.insert(ocCount);
-    maOpenCLSubsetOpCodes.insert(ocVar);
-    maOpenCLSubsetOpCodes.insert(ocNormDist);
-    maOpenCLSubsetOpCodes.insert(ocVLookup);
-    maOpenCLSubsetOpCodes.insert(ocCorrel);
-    maOpenCLSubsetOpCodes.insert(ocCovar);
-    maOpenCLSubsetOpCodes.insert(ocPearson);
-    maOpenCLSubsetOpCodes.insert(ocSlope);
-    maOpenCLSubsetOpCodes.insert(ocSumIfs);
+    maOpenCLSubsetOpCodes = aDefaultOpenCLSubsetOpCodes;
 }
 
 void ScCalcConfig::reset()