summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-01-07 14:08:09 +0200
committerTor Lillqvist <tml@collabora.com>2014-01-07 14:23:02 +0200
commitd7f899bc56affad4ddd1672d3bfb354dc5966196 (patch)
tree58552e1c728bf635bbf77bedf7d5265f0ca51258 /sc
parent0c7309cfa5cbf295aae2917d1ccd73d5ab8ed026 (diff)
Drop the check of the SC_BACKGROUND_COMPILATION env var
Change-Id: Ia33002819023c79160d921fbc1cca7a5c12d143a
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/formulacell.cxx16
-rw-r--r--sc/source/core/tool/formulaopt.cxx5
2 files changed, 8 insertions, 13 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 531c7e54d4fe..721f2681c67d 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -415,18 +415,14 @@ ScFormulaCellGroup::ScFormulaCellGroup() :
mbSubTotal(false),
meCalcState(sc::GroupCalcEnabled)
{
- static bool bBackgroundCompilation = getenv("SC_BACKGROUND_COMPILATION") != NULL;
- if (bBackgroundCompilation)
+ if (ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
{
- if (ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
+ osl::MutexGuard aGuard(getOpenCLCompilationThreadMutex());
+ if (snCount++ == 0)
{
- osl::MutexGuard aGuard(getOpenCLCompilationThreadMutex());
- if (snCount++ == 0)
- {
- assert(!sxCompilationThread.is());
- sxCompilationThread.set(new sc::CLBuildKernelThread);
- sxCompilationThread->launch();
- }
+ assert(!sxCompilationThread.is());
+ sxCompilationThread.set(new sc::CLBuildKernelThread);
+ sxCompilationThread->launch();
}
}
}
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index ebeece1086f7..e954423886e4 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -412,10 +412,9 @@ void ScFormulaCfg::UpdateFromProperties( const Sequence<OUString>& aNames )
{
sal_Bool bVal = GetCalcConfig().mbOpenCLEnabled;
pValues[nProp] >>= bVal;
-#if 0 // Don't remove please unless the SC_BACKGROUND_COMPILATION env var thing goes away.
+#if 0 // Don't remove please.
// The intent here is that tml when running CppunitTest_sc_opencl_test turns this on.
- if (getenv("SC_BACKGROUND_COMPILATION") != NULL)
- bVal = sal_True;
+ bVal = sal_True;
#endif
GetCalcConfig().mbOpenCLEnabled = bVal;
}