diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-11-19 12:48:01 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-11-20 22:50:43 +0100 |
| commit | 056bce9c6150d23f952888ec525b9820aa7230e3 (patch) | |
| tree | 3caebe85b5736e72bbaa0c2f1473540f12aa2263 /sc | |
| parent | e8169a821c40ee4b0c427f5c2e9b7fa6ab3b4536 (diff) | |
sc: One more place needed when one wants to enable the S/W interpreter.
Rename the variable too when I am at that; it may be broken, but the user
knows what he/she's doing when using an env. var.
Change-Id: Ia457c477e5677e7f89a35b331df0933e2eb3f5b3
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/formulacell.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/formulagroup.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index abdab5d88e55..d429c89d59d3 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -3878,7 +3878,7 @@ bool ScFormulaCell::InterpretFormulaGroup() return false; } - if (!ScCalcConfig::isOpenCLEnabled()) + if (!ScCalcConfig::isOpenCLEnabled() && (getenv("SC_ALLOW_SOFTWARE_INTERPRETER") == nullptr)) return false; // TODO : Disable invariant formula group interpretation for now in order diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx index 2cd6fb3557f6..085dc0f99afa 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 = (getenv("SC_ALLOW_SOFTWARE_INTERPRETER") != nullptr); 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 = (getenv("SC_ALLOW_SOFTWARE_INTERPRETER") != nullptr); if (!bOpenCLEnabled || (bAllowSoftwareInterpreter && rDeviceId == OPENCL_SOFTWARE_DEVICE_CONFIG_NAME)) { if(msInstance) |