diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-01-12 15:40:53 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-01-12 15:41:53 +0200 |
| commit | 69753da13f7c86b6f1fccb814cd4d89427304690 (patch) | |
| tree | eef919416cc7d037606a02200d2a69c749d531b2 | |
| parent | 2651f3fe838afe1cb0460291c814799d6487e2d9 (diff) | |
Add RAND to the default subset of opcodes for which we trust our OpenCL
Change-Id: I1ca574f96ad84aa263bdcecbe549687fbf10d0d8
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 4 | ||||
| -rw-r--r-- | sc/source/core/tool/calcconfig.cxx | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 832c795a73f4..3ec97de049e7 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1371,9 +1371,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 3e00b059a213..1cbb3f52e1ba 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); |