[Libreoffice-commits] core.git: Branch 'feature/fixes12' - sc/source

[Jan Holesovsky]

 sc/source/core/tool/formulagroup.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7927a26c139e6ee2d3f37448643571240fd4b8d5
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Nov 16 18:20:08 2015 +0100

    Test commit: enable the software interpreter unconditionally.
    
    Change-Id: I132ea8eb72ca19be5e15c2dd7d5cb820a7db46ca

diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index a436c89..80a5d4f 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -475,7 +475,7 @@ FormulaGroupInterpreter *FormulaGroupInterpreter::getStatic()
         if (ScCalcConfig::isOpenCLEnabled())
             switchOpenCLDevice(rConfig.maOpenCLDevice, rConfig.mbOpenCLAutoSelect);
 #endif
-        static bool bAllowSoftwareInterpreter = (getenv("SC_ALLOW_BROKEN_SOFTWARE_INTERPRETER") != nullptr);
+        static bool bAllowSoftwareInterpreter = true;
 
         if ( !msInstance && bAllowSoftwareInterpreter ) // software fallback
         {
@@ -499,7 +499,7 @@ void FormulaGroupInterpreter::fillOpenCLInfo(std::vector<OpenCLPlatformInfo>& rP
 bool FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool bAutoSelect, bool bForceEvaluation)
 {
     bool bOpenCLEnabled = ScCalcConfig::isOpenCLEnabled();
-    static bool bAllowSoftwareInterpreter = (getenv("SC_ALLOW_BROKEN_SOFTWARE_INTERPRETER") != nullptr);
+    static bool bAllowSoftwareInterpreter = true;
     if (!bOpenCLEnabled || (bAllowSoftwareInterpreter && rDeviceId == OPENCL_SOFTWARE_DEVICE_CONFIG_NAME))
     {
         if(msInstance)