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

[Tor Lillqvist]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |    4 ++--
 sc/source/core/tool/calcconfig.cxx                       |    2 +-
 sc/uiconfig/scalc/ui/formulacalculationoptions.ui        |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 86db1702d72a103ffeafc69dcaa63318539c147a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 13 17:07:29 2015 +0200

    Decrease the formula group size limit for OpenCL to be considered back to 100
    
    Are we having fun yet?
    
    This reverts commit 0694e8313877ca433d226c753301a5a90364b3a5.
    
    Change-Id: I378a1695a7b3bd8a1b6bb3d5aa1fff53ab8c7bb5

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 5d106dc..4e20f9e 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>Lower limit on the size of a formula group for OpenCL to be considered.</desc>
+            <desc>An approximate lower limit on the number of data cells a spreadsheet formula should use for OpenCL to be considered.</desc>
           </info>
-          <value>10000</value>
+          <value>100</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 36db540..f380d13 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 = 10000;
+    mnOpenCLMinimumFormulaGroupSize = 100;
 
     // Keep in order of opcode value, is that clearest? (Random order,
     // at least, would make no sense at all.)
diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
index d3aa3d7..20cfab0 100644
--- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
+++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
@@ -5,7 +5,7 @@
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">2</property>
-    <property name="value">10000</property>
+    <property name="value">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">100</property>
   </object>
commit f2eaf4dbae3cc8fd0fca51b161be8bfde0a4eead
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 13 16:27:09 2015 +0200

    Allow setting the limit to the minumum possible
    
    Also change the default to what it actually is now.
    
    Change-Id: Iac5737f9328587c9f0757acecce4f2e77e715d8b

diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
index 4e81c04..d3aa3d7 100644
--- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
+++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
@@ -4,8 +4,8 @@
   <requires lib="gtk+" version="3.6"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="lower">100</property>
-    <property name="value">100</property>
+    <property name="lower">2</property>
+    <property name="value">10000</property>
     <property name="step_increment">1</property>
     <property name="page_increment">100</property>
   </object>