[Libreoffice-commits] core.git: sc/source

[Tor Lillqvist]

 sc/source/core/tool/formulagroup.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 9bda6170f61672624b0318ac5091b5bd427584f1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Dec 2 14:40:56 2013 +0200

    Fix build without OpenCL
    
    Change-Id: I15e4495607113eb9bc55a31fee061a9d5384731b

diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index 3909bca..8536a94 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -27,6 +27,7 @@
 
 #include <cstdio>
 
+#if HAVE_FEATURE_OPENCL
 #ifdef DISABLE_DYNLOADING
 
 extern "C" size_t getOpenCLPlatformCount(void);
@@ -36,6 +37,7 @@ extern "C" sc::FormulaGroupInterpreter* createFormulaGroupOpenCLInterpreter();
 extern "C" void getOpenCLDeviceInfo(size_t*, size_t*);
 
 #endif
+#endif
 
 namespace sc {
 
@@ -556,6 +558,9 @@ FormulaGroupInterpreter *FormulaGroupInterpreter::getStatic()
 
 void FormulaGroupInterpreter::fillOpenCLInfo(std::vector<OpenclPlatformInfo>& rPlatforms)
 {
+#if !HAVE_FEATURE_OPENCL
+    (void) rPlatforms;
+#else
 #ifndef DISABLE_DYNLOADING
     osl::Module* pModule = getOpenCLModule();
     if (!pModule)
@@ -585,6 +590,7 @@ void FormulaGroupInterpreter::fillOpenCLInfo(std::vector<OpenclPlatformInfo>& rP
     ::fillOpenCLInfo(&aPlatforms[0], aPlatforms.size());
     rPlatforms.swap(aPlatforms);
 #endif
+#endif
 }
 
 bool FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool bAutoSelect, bool bForceEvaluation)