summaryrefslogtreecommitdiff
path: root/sc/source/core/tool
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-11-27 14:16:36 +0200
committerTor Lillqvist <tml@collabora.com>2014-11-28 10:23:50 +0200
commitd4f63f5e767d23675240e9dd6d95fc9496ad9df5 (patch)
treeb635600faefbb593ed11cb05082654efabb9d552 /sc/source/core/tool
parent8f4549109da2a7a0860cdebedcb2cbe8ddbd601a (diff)
Fix OpenCL-less build harder
Change-Id: I1627f534505c735455c50f9b4f6e4d1c698ab9d2
Diffstat (limited to 'sc/source/core/tool')
-rw-r--r--sc/source/core/tool/formulagroup.cxx3
-rw-r--r--sc/source/core/tool/formulaopt.cxx3
2 files changed, 4 insertions, 2 deletions
diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index 705029b89f13..328e3c3b0083 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -523,10 +523,11 @@ FormulaGroupInterpreter *FormulaGroupInterpreter::getStatic()
if ( !msInstance )
{
+#if HAVE_FEATURE_OPENCL
const ScCalcConfig& rConfig = ScInterpreter::GetGlobalConfig();
if (officecfg::Office::Common::Misc::UseOpenCL::get())
switchOpenCLDevice(rConfig.maOpenCLDevice, rConfig.mbOpenCLAutoSelect, false);
-
+#endif
if ( !msInstance ) // software fallback
{
SAL_INFO("sc.formulagroup", "Create S/W interpreter");
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index b0f76c86b048..60378df03122 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -649,10 +649,11 @@ void ScFormulaCfg::Commit()
break;
}
}
+#if HAVE_FEATURE_OPENCL
if(bSetOpenCL)
sc::FormulaGroupInterpreter::switchOpenCLDevice(
GetCalcConfig().maOpenCLDevice, GetCalcConfig().mbOpenCLAutoSelect);
-
+#endif
PutProperties(aNames, aValues);
}