Work in progress: Move Calc-independend OpenCL configuration out of sc

Intermediate commit. More changes will follow: The device selection
logic needs to be moved, too. (And cleaned up.) Instead of the
separate formulacalculationoptions dialog we should simply have a
normal options page for those OpenCL-related settings that will remain
purely Calc-specific, like the formula opcode subsetting.

Change-Id: Id60d95e80d377cbbf5780beb473b221bce06b5e5

2 files changed, 14 insertions, 14 deletions

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 001654a5e30d..d82ade012fd0 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1382,20 +1382,6 @@
           </info>
           <value/>
         </prop>
-        <prop oor:name="OpenCLBlackList" oor:type="oor:string-list" oor:nillable="false">
-          <!-- UIHints: Tools - Options  Spreadsheet  Formula -->
-          <info>
-            <desc>Combinations of (OS, OS version, OpenCL platform vendor, OpenCL device name, OpenCL driver version) that are known to be bad. Each entry is a string consisting of five parts separated by slashes. An empty part matches anything. In case a slash, percent or semicolon occurs inside a part, it is replaced by a percent followed by the corresponding number as two hex digits. The parts except OS can contain regular expressions. Inside these regular expressions the usual characters .*()[]\ are special and should be quoted with a backslash to be interpreted literally. OS should be just one of "Linux", "OS X" (including the space) or "Windows" (without quotes). Has higher priority than OpenCLWhiteList.</desc>
-          </info>
-          <value oor:separator=";">Windows//Intel\(R\) Corporation//9\.17\.10\.2884</value>
-        </prop>
-        <prop oor:name="OpenCLWhiteList" oor:type="oor:string-list" oor:nillable="false">
-          <!-- UIHints: Tools - Options  Spreadsheet  Formula -->
-          <info>
-            <desc>Like OpenCLBlackList, but for combinations known to be good.</desc>
-          </info>
-          <value oor:separator=";">Linux//Advanced Micro Devices, Inc\.//1445\.5 \(sse2,avx\);//Advanced Micro Devices, Inc\.//;//Intel\(R\) Corporation//;//NVIDIA Corporation//</value>
-        </prop>
       </group>
       <group oor:name="Syntax">
         <info>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index fe39b085a580..17ed48a10ed5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5560,6 +5560,20 @@
         </info>
         <value>true</value>
       </prop>
+      <prop oor:name="OpenCLBlackList" oor:type="oor:string-list" oor:nillable="false">
+        <!-- UIHints: Tools - Options General OpenCL -->
+        <info>
+          <desc>Combinations of (OS, OS version, OpenCL platform vendor, OpenCL device name, OpenCL driver version) that are known to be bad. Each entry is a string consisting of five parts separated by slashes. An empty part matches anything. In case a slash, percent or semicolon occurs inside a part, it is replaced by a percent followed by the corresponding number as two hex digits. The parts except OS can contain regular expressions. Inside these regular expressions the usual characters .*()[]\ are special and should be quoted with a backslash to be interpreted literally. OS should be just one of "Linux", "OS X" (including the space) or "Windows" (without quotes). Has higher priority than OpenCLWhiteList.</desc>
+        </info>
+        <value oor:separator=";">Windows//Intel\(R\) Corporation//9\.17\.10\.2884</value>
+      </prop>
+      <prop oor:name="OpenCLWhiteList" oor:type="oor:string-list" oor:nillable="false">
+        <!-- UIHints: Tools - Options General OpenCL  -->
+        <info>
+          <desc>Like OpenCLBlackList, but for combinations known to be good.</desc>
+        </info>
+        <value oor:separator=";">Linux//Advanced Micro Devices, Inc\.//1445\.5 \(sse2,avx\);//Advanced Micro Devices, Inc\.//;//Intel\(R\) Corporation//;//NVIDIA Corporation//</value>
+      </prop>
       <prop oor:name="MacroRecorderMode" oor:type="xs:boolean" oor:nillable="false">
         <info>
           <desc>Determines if the limited, and awkward code producing