From 3a58704459a8e60ecca337a247331ac55b7672d3 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Mon, 24 Nov 2014 18:08:55 +0200
Subject: Make whether to use OpenCL or not a global option

Add a toggle to the "General" page.

Change-Id: If35b1472032706b09a3bc3499c55cbd3ac2e13ac
---
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs   | 7 -------
 officecfg/registry/schema/org/openoffice/Office/Common.xcs | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'officecfg')

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index c7aac17a05ed..001654a5e30d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1344,13 +1344,6 @@
 	to those assigned in setOpenCLConfigToDefault() in
 	sc/source/core/tool/calcconfig.cxx
 	-->
-        <prop oor:name="OpenCL" oor:type="xs:boolean" oor:nillable="false">
-          <!-- UIHints: Tools - Options  Spreadsheet  Formula -->
-          <info>
-            <desc>Whether to use OpenCL for formula computation, if available.</desc>
-          </info>
-          <value>true</value>
-        </prop>
         <prop oor:name="OpenCLSubsetOnly" oor:type="xs:boolean" oor:nillable="false">
           <!-- UIHints: Tools - Options  Spreadsheet  Formula -->
           <info>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index edede779b640..74a25aa4811f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5553,6 +5553,13 @@
         </info>
         <value>false</value>
       </prop>
+      <prop oor:name="UseOpenCL" oor:type="xs:boolean" oor:nillable="false">
+        <info>
+          <desc>Determines whether OpenCL can be used, when available, to speed up
+          some operations.</desc>
+        </info>
+        <value>true</value>
+      </prop>
       <prop oor:name="MacroRecorderMode" oor:type="xs:boolean" oor:nillable="false">
         <info>
           <desc>Determines if the limited, and awkward code producing
-- 
cgit