mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop Add, Sub, Mul and Div from the default opcode subset

Browse Source 
Those are supposed to obey the current setting for "Conversion from text to
number", and the OpenCL code does not currently take that setting into
consideration.

Change-Id: Iff6eeda6238c78f4aeb8eb27898ce7ea243b9dea
This commit is contained in:
Tor Lillqvist
2015-01-12 20:24:07 +02:00
parent 0694e83138
commit ad582ce757
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
officecfg/registry/schema/org/openoffice/Office/Calc.xcs
View File

@@ -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 -->

4
sc/source/core/tool/calcconfig.cxx
View File

@@ -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);