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

[Tor Lillqvist]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |    8 ++++----
 sc/source/core/tool/calcconfig.cxx                       |    6 +-----
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit ad582ce757f671a6271648e22a136f2d238cc15e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jan 12 20:24:07 2015 +0200

    Drop Add, Sub, Mul and Div from the default opcode subset
    
    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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 51b9c64..5d106dc 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 2b97929..36db540 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);
commit 0694e8313877ca433d226c753301a5a90364b3a5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jan 12 18:19:39 2015 +0200

    Increase the formula group size limit for OpenCL to be considered to 10000
    
    Also changed the description to match the meaning (after
    2021275f8fc33d9917d5fef58959a95da1dc7e6f).
    
    Change-Id: Ide4b4f094495c178252c3167d52012f46f26b025

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 3ec97de..51b9c64 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1361,9 +1361,9 @@
         <prop oor:name="OpenCLMinimumDataSize" oor:type="xs:int">
           <!-- UIHints: Tools - Options  Spreadsheet  Formula -->
           <info>
-            <desc>An approximate lower limit on the number of data cells a spreadsheet formula should use for OpenCL to be considered.</desc>
+            <desc>Lower limit on the size of a formula group for OpenCL to be considered.</desc>
           </info>
-          <value>100</value>
+          <value>10000</value>
         </prop>
         <prop oor:name="OpenCLSubsetOpCodes" oor:type="xs:string" 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 1cbb3f5..2b97929 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -37,7 +37,7 @@ void ScCalcConfig::setOpenCLConfigToDefault()
     // Crazy.
     mbOpenCLSubsetOnly = true;
     mbOpenCLAutoSelect = true;
-    mnOpenCLMinimumFormulaGroupSize = 100;
+    mnOpenCLMinimumFormulaGroupSize = 10000;
 
     // Keep in order of opcode value, is that clearest? (Random order,
     // at least, would make no sense at all.)