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

Repository.mk

@@ -402,6 +402,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	odfflatxml \
 	offacc \
 	oox \
+	$(call gb_Helper_optional,OPENCL,opencl) \
 	passwordcontainer \
 	pcr \
 	$(if $(ENABLE_NPAPI_FROM_BROWSER),pl) \

RepositoryModule_host.mk

@@ -82,6 +82,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	officecfg \
 	oovbaapi \
 	oox \
+	$(call gb_Helper_optional,OPENCL,opencl) \
 	package \
 	postprocess \
 	$(call gb_Helper_optional,PYUNO,pyuno) \

config_host.mk.in

@@ -157,7 +157,6 @@ export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@
 export ENABLE_OOENV=@ENABLE_OOENV@
 export ENABLE_OPENGL=@ENABLE_OPENGL@
 export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
-export ENABLE_OPENCL=@ENABLE_OPENCL@
 export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
 export ENABLE_PCH=@ENABLE_PCH@
 export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@

configure.ac

@@ -10261,13 +10261,13 @@ dnl =================================================
 dnl Check whether to build with OpenCL support.
 dnl =================================================
 
-ENABLE_OPENCL=
 if test $_os != iOS -a $_os != Android; then
-    ENABLE_OPENCL=TRUE
-    BUILD_TYPE="$BUILD_TYPE CLCC"
+    # CLCC in BUILD_TYPE tells that we are building a bundled clcc (just the clew part), OPENCL in
+    # BUILD_TYPE tells that OpenCL is potentially available on the platform (optional at run-time,
+    # used through clew).
+    BUILD_TYPE="$BUILD_TYPE CLCC OPENCL"
     AC_DEFINE(HAVE_FEATURE_OPENCL)
 fi
-AC_SUBST(ENABLE_OPENCL)
 
 dnl ===================================================================
 dnl Check whether to enable glTF support

cui/Library_cui.mk

@@ -44,6 +44,8 @@ $(eval $(call gb_Library_use_libraries,cui,\
     $(if $(ENABLE_JAVA), \
         jvmfwk) \
     lng \
+	$(call gb_Helper_optional,OPENCL, \
+		opencl) \
     sal \
     salhelper \
     sax \
@@ -64,6 +66,8 @@ $(eval $(call gb_Library_use_libraries,cui,\
 
 $(eval $(call gb_Library_use_externals,cui,\
 	boost_headers \
+	$(call gb_Helper_optional,OPENCL,\
+		clew) \
     icuuc \
     icu_headers \
 ))
@@ -153,6 +157,8 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
     cui/source/options/optjsearch \
     cui/source/options/optlingu \
     cui/source/options/optmemory \
+	$(call gb_Helper_optional,OPENCL, \
+	    cui/source/options/optopencl) \
     cui/source/options/optpath \
     cui/source/options/optsave \
     cui/source/options/optupdt \

cui/UIConfig_cui.mk

@@ -28,6 +28,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/backgroundpage \
 	cui/uiconfig/ui/baselinksdialog \
 	cui/uiconfig/ui/bitmaptabpage \
+	cui/uiconfig/ui/blackorwhitelistentrydialog \
 	cui/uiconfig/ui/borderareatransparencydialog \
 	cui/uiconfig/ui/borderbackgrounddialog \
 	cui/uiconfig/ui/borderpage \
@@ -131,6 +132,8 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/optmemorypage \
 	cui/uiconfig/ui/optnewdictionarydialog \
 	cui/uiconfig/ui/optonlineupdatepage \
+	$(call gb_Helper_optional,OPENCL, \
+		cui/uiconfig/ui/optopenclpage) \
 	cui/uiconfig/ui/optpathspage \
 	cui/uiconfig/ui/optproxypage \
 	cui/uiconfig/ui/optsavepage \

cui/source/inc/cuires.hrc

@@ -436,6 +436,8 @@
 #define RID_SVXSTR_PERSONA_MUSIC                            (RID_SVX_START + 1288)
 #define RID_SVXSTR_PERSONA_NATURE                           (RID_SVX_START + 1289)
 
+#define RID_SVXPAGE_OPENCL                                  (RID_SVX_START + 254)
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/options/optgdlg.cxx

@@ -209,7 +209,6 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     get(m_pYearValueField, "year");
     get(m_pToYearFT, "toyear");
     get(m_pCollectUsageInfo, "collectusageinfo");
-    get(m_pUseOpenCL, "useopencl");
 
     if (m_pFileDlgCB->IsVisible() && SvtMiscOptions().IsUseSystemFileDialogReadOnly())
     {
@@ -302,12 +301,6 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
         bModified = true;
     }
 
-    if (m_pUseOpenCL->IsValueChangedFromSaved())
-    {
-        officecfg::Office::Common::Misc::UseOpenCL::set(m_pUseOpenCL->IsChecked(), batch);
-        bModified = true;
-    }
-
     batch->commit();
 
     return bModified;
@@ -349,9 +342,6 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
 
     m_pCollectUsageInfo->Check(officecfg::Office::Common::Misc::CollectUsageInformation::get());
     m_pCollectUsageInfo->SaveValue();
-
-    m_pUseOpenCL->Check(officecfg::Office::Common::Misc::UseOpenCL::get());
-    m_pUseOpenCL->SaveValue();
 }
 
 

cui/source/options/optgdlg.hxx

@@ -57,8 +57,6 @@ private:
 
     CheckBox*     m_pCollectUsageInfo;
 
-    CheckBox*     m_pUseOpenCL;
-
     DECL_LINK( TwoFigureHdl, NumericField* );
     DECL_LINK( TwoFigureConfigHdl, NumericField* );
     DECL_LINK(HelpCheckHdl_Impl, void *);