Kaydet (Commit) f3f71d1d authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Drop the check of the SC_BACKGROUND_COMPILATION env var

Change-Id: Ia33002819023c79160d921fbc1cca7a5c12d143a
üst 49bc2ac2
...@@ -137,8 +137,6 @@ ScDocShell& Test::getDocShell() ...@@ -137,8 +137,6 @@ ScDocShell& Test::getDocShell()
void Test::setUp() void Test::setUp()
{ {
osl_clearEnvironment(OUString("SC_BACKGROUND_COMPILATION").pData);
BootstrapFixture::setUp(); BootstrapFixture::setUp();
ScDLL::Init(); ScDLL::Init();
......
...@@ -415,18 +415,14 @@ ScFormulaCellGroup::ScFormulaCellGroup() : ...@@ -415,18 +415,14 @@ ScFormulaCellGroup::ScFormulaCellGroup() :
mbSubTotal(false), mbSubTotal(false),
meCalcState(sc::GroupCalcEnabled) meCalcState(sc::GroupCalcEnabled)
{ {
static bool bBackgroundCompilation = getenv("SC_BACKGROUND_COMPILATION") != NULL; if (ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
if (bBackgroundCompilation)
{ {
if (ScInterpreter::GetGlobalConfig().mbOpenCLEnabled) osl::MutexGuard aGuard(getOpenCLCompilationThreadMutex());
if (snCount++ == 0)
{ {
osl::MutexGuard aGuard(getOpenCLCompilationThreadMutex()); assert(!sxCompilationThread.is());
if (snCount++ == 0) sxCompilationThread.set(new sc::CLBuildKernelThread);
{ sxCompilationThread->launch();
assert(!sxCompilationThread.is());
sxCompilationThread.set(new sc::CLBuildKernelThread);
sxCompilationThread->launch();
}
} }
} }
} }
......
...@@ -412,10 +412,9 @@ void ScFormulaCfg::UpdateFromProperties( const Sequence<OUString>& aNames ) ...@@ -412,10 +412,9 @@ void ScFormulaCfg::UpdateFromProperties( const Sequence<OUString>& aNames )
{ {
sal_Bool bVal = GetCalcConfig().mbOpenCLEnabled; sal_Bool bVal = GetCalcConfig().mbOpenCLEnabled;
pValues[nProp] >>= bVal; 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. // 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 #endif
GetCalcConfig().mbOpenCLEnabled = bVal; GetCalcConfig().mbOpenCLEnabled = bVal;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment