sc/source/core/data/formulacell.cxx | 2 +-
sc/source/core/tool/formulagroup.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 056bce9c6150d23f952888ec525b9820aa7230e3
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu Nov 19 12:48:01 2015 +0100
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
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index abdab5d..d429c89 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 2cd6fb3..085dc0f 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
