summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Calc.xcs4
-rw-r--r--sc/source/core/tool/calcconfig.cxx4
2 files changed, 2 insertions, 6 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 51b9c64562cc..5d106dc681d0 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;SUMPRODUCT;MIN;MAX;SUM;PRODUCT;AVERAGE;COUNT;NORMDIST;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;66;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;227;236;403</value>
+ <value>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 2b97929199d7..36db540cc363 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -41,10 +41,6 @@ void ScCalcConfig::setOpenCLConfigToDefault()
// 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);