tdf#151144 move OpenCL checkbox under 'CPU Threading Settings'

Change-Id: I1ef81a5de901f58d09eef95053cba83627b4b264
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198330
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Tested-by: Jenkins

sc/source/ui/inc/tpcalc.hxx

@@ -66,9 +66,8 @@ private:
 
 #if HAVE_FEATURE_OPENCL
     OpenCLConfig maConfig;
-    std::unique_ptr<weld::CheckButton> m_xAllowOpenCL;
 #endif
-    std::unique_ptr<weld::Frame> m_xOpenCLFrame;
+    std::unique_ptr<weld::CheckButton> m_xAllowOpenCL;
 
     std::unique_ptr<weld::CheckButton> m_xBtnCase;
     std::unique_ptr<weld::Widget> m_xBtnCaseImg;

sc/source/ui/optdlg/tpcalc.cxx

@@ -58,9 +58,8 @@ ScTpCalcOptions::ScTpCalcOptions(weld::Container* pPage, weld::DialogController*
     , m_xDateImg(m_xBuilder->weld_widget(u"lockdate"_ustr))
 #if HAVE_FEATURE_OPENCL
     , maConfig(OpenCLConfig::get())
-    , m_xAllowOpenCL(m_xBuilder->weld_check_button(u"allowopencl"_ustr))
 #endif
-    , m_xOpenCLFrame(m_xBuilder->weld_frame(u"OptOpenCLPage"_ustr))
+    , m_xAllowOpenCL(m_xBuilder->weld_check_button(u"allowopencl"_ustr))
     , m_xBtnCase(m_xBuilder->weld_check_button(u"case"_ustr))
     , m_xBtnCaseImg(m_xBuilder->weld_widget(u"lockcase"_ustr))
     , m_xBtnCalc(m_xBuilder->weld_check_button(u"calc"_ustr))
@@ -110,7 +109,7 @@ void ScTpCalcOptions::InitOpenCL()
     m_xAllowOpenCL->set_sensitive(!officecfg::Office::Common::Misc::UseOpenCL::isReadOnly()
                                   && openclwrapper::GPUEnv::isOpenCLEnabled());
 #endif
-    m_xOpenCLFrame->set_visible(HAVE_FEATURE_OPENCL);
+    m_xAllowOpenCL->set_visible(HAVE_FEATURE_OPENCL);
 }
 
 std::unique_ptr<SfxTabPage> ScTpCalcOptions::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
@@ -279,7 +278,7 @@ OUString ScTpCalcOptions::GetAllStrings()
     OUStringBuffer sAllStrings;
     OUString labels[] = { u"label5"_ustr, u"label1"_ustr,  u"precft"_ustr,
                           u"label2"_ustr, u"stepsft"_ustr, u"minchangeft"_ustr,
-                          u"label4"_ustr, u"label3"_ustr,  u"openclframe"_ustr };
+                          u"label4"_ustr, u"label3"_ustr };
 
     for (const auto& label : labels)
     {

sc/uiconfig/scalc/ui/optcalculatepage.ui

@@ -30,7 +30,7 @@
         <property name="label-xalign">0</property>
         <property name="shadow-type">none</property>
         <child>
-          <!-- n-columns=3 n-rows=1 -->
+          <!-- n-columns=3 n-rows=2 -->
           <object class="GtkGrid" id="grid4">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
@@ -68,6 +68,25 @@
                 <property name="top-attach">0</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkCheckButton" id="allowopencl">
+                <property name="label" translatable="yes" context="optcalculatepage|allowopencl">Allow use of OpenCL</property>
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="draw-indicator">True</property>
+              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
         </child>
         <child type="label">
@@ -747,51 +766,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkFrame" id="OptOpenCLPage">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label-xalign">0</property>
-        <property name="shadow-type">none</property>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="halign">start</property>
-            <property name="valign">start</property>
-            <property name="margin-start">12</property>
-            <property name="margin-top">6</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkCheckButton" id="allowopencl">
-                <property name="label" translatable="yes" context="optcalculatepage|allowopencl">Allow use of OpenCL</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
-                <property name="draw-indicator">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="openclframe">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="label" translatable="yes" context="optcalculatepage|openclframe">OpenCL Options</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="left-attach">1</property>
-        <property name="top-attach">1</property>
-      </packing>
+      <placeholder/>
     </child>
   </object>
 </interface>