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

[Tor Lillqvist]

 sc/qa/unit/ucalc.cxx                |    2 --
 sc/source/core/data/formulacell.cxx |   16 ++++++----------
 sc/source/core/tool/formulaopt.cxx  |    5 ++---
 3 files changed, 8 insertions(+), 15 deletions(-)

New commits:
commit f3f71d1d64e8d05260a4a49ba3e0191a089324b0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 7 14:08:09 2014 +0200

    Drop the check of the SC_BACKGROUND_COMPILATION env var
    
    Change-Id: Ia33002819023c79160d921fbc1cca7a5c12d143a

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 5196c98..7c1d72d 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -137,8 +137,6 @@ ScDocShell& Test::getDocShell()
 
 void Test::setUp()
 {
-    osl_clearEnvironment(OUString("SC_BACKGROUND_COMPILATION").pData);
-
     BootstrapFixture::setUp();
 
     ScDLL::Init();
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 531c7e5..721f268 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 ebeece1..e954423 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;
                 }