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

[Tor Lillqvist]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |    4 ++--
 sc/source/core/tool/calcconfig.cxx                       |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit cd5f69376bf27275d92073943451b8b72a708d04
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jan 12 15:40:53 2015 +0200

    Add RAND to the default subset of opcodes for which we trust our OpenCL
    
    Change-Id: I1ca574f96ad84aa263bdcecbe549687fbf10d0d8
    Reviewed-on: https://gerrit.libreoffice.org/14052
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index d82ade0..b532729 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1364,9 +1364,9 @@
             <desc>The list of operator and function opcodes for which to use OpenCL. If a
 	    formula contains only these operators and functions, it
 	    might be calculated using OpenCL.</desc>
-          <!-- numeric values correspond to RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSINV;ROUND;POWER;SUBPRODUCT;PROUDCT;NORMDIST;MIN;MAX;SUM;AVERAGE;SUMIFS -->
+          <!-- numeric values correspond to +;-;*;/;RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSINV;ROUND;POWER;SUMPRODUCT;MIN;MAX;SUM;PRODUCT;AVERAGE;COUNT;NORMDIST;SUMIFS -->
           </info>
-          <value>40;41;42;43;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;227;236;403</value>
+          <value>40;41;42;43;66;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;227;236;403</value>
         </prop>
         <prop oor:name="OpenCLAutoSelect" oor:type="xs:boolean" oor:nillable="false">
           <!-- UIHints: Tools - Options  Spreadsheet  Formula -->
diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx
index 91ae7e5..144d5a84 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -45,6 +45,7 @@ void ScCalcConfig::setOpenCLConfigToDefault()
     maOpenCLSubsetOpCodes.insert(ocSub);
     maOpenCLSubsetOpCodes.insert(ocMul);
     maOpenCLSubsetOpCodes.insert(ocDiv);
+    maOpenCLSubsetOpCodes.insert(ocRandom);
     maOpenCLSubsetOpCodes.insert(ocSin);
     maOpenCLSubsetOpCodes.insert(ocCos);
     maOpenCLSubsetOpCodes.insert(ocTan);