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

Tor Lillqvist tml at collabora.com
Fri Mar 6 10:37:32 PST 2015


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

New commits:
commit acaafc03e623ac25d4408605f34d50618926c5d0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Mar 6 18:02:56 2015 +0200

    Add NORMSDIST to the default OpenCL use opcode subset
    
    Change-Id: I7ee56f06e8e50180e31c01253c9100c11b485c0d

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 679e868..e680389 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1373,7 +1373,7 @@
             true, and a formula contains only these operators and
             functions, it might be calculated using OpenCL.</desc>
           </info>
-          <value>+;-;*;/;RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSINV;ROUND;POWER;SUMPRODUCT;MIN;MAX;SUM;PRODUCT;AVERAGE;COUNT;VAR;NORMDIST;CORREL;COVAR;PEARSON;SLOPE;SUMIFS</value>
+          <value>+;-;*;/;RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSDIST;NORMSINV;ROUND;POWER;SUMPRODUCT;MIN;MAX;SUM;PRODUCT;AVERAGE;COUNT;VAR;NORMDIST;CORREL;COVAR;PEARSON;SLOPE;SUMIFS</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 7a108f5..6fd4345 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -53,6 +53,7 @@ void ScCalcConfig::setOpenCLConfigToDefault()
     maOpenCLSubsetOpCodes.insert(ocExp);
     maOpenCLSubsetOpCodes.insert(ocLn);
     maOpenCLSubsetOpCodes.insert(ocSqrt);
+    maOpenCLSubsetOpCodes.insert(ocStdNormDist);
     maOpenCLSubsetOpCodes.insert(ocSNormInv);
     maOpenCLSubsetOpCodes.insert(ocRound);
     maOpenCLSubsetOpCodes.insert(ocPower);


More information about the Libreoffice-commits mailing list