diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-12-31 15:34:03 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-12-31 15:36:39 -0500 |
| commit | 37488b56d33533ad6d705c6d2e16eb6b5af67f65 (patch) | |
| tree | d3032ac7ba559d6be678be94ca65a4a47c108284 | |
| parent | ec6050497acb445d168f835dfc745ceace072ab9 (diff) | |
Honor selected device detection settings.
This fixes the problem of the software interpreter always getting selected
after initial startup where the settings are read from user configuration.
Change-Id: Iecbb7ae644c1264811f5280e1425a8dd776c2c1a
| -rw-r--r-- | sc/source/core/tool/formulagroup.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx index 8536a949436e..4e13ad391fce 100644 --- a/sc/source/core/tool/formulagroup.cxx +++ b/sc/source/core/tool/formulagroup.cxx @@ -545,7 +545,10 @@ FormulaGroupInterpreter *FormulaGroupInterpreter::getStatic() if ( !msInstance ) { - switchOpenCLDevice(OUString(), ScInterpreter::GetGlobalConfig().mbOpenCLEnabled); + const ScCalcConfig& rConfig = ScInterpreter::GetGlobalConfig(); + if (rConfig.mbOpenCLEnabled) + switchOpenCLDevice(rConfig.maOpenCLDevice, rConfig.mbOpenCLAutoSelect, false); + if ( !msInstance ) // software fallback { fprintf(stderr, "Create S/W interp\n"); |