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:37:30 -0500 |
| commit | 30e2e49294731d4732f095779fd988b42f70f336 (patch) | |
| tree | 483529b8938e99a2e7f9dfa8835272d32bb2be0c | |
| parent | fccf9404762b5c73af1dfa6523d6b8c2b3e91dd8 (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
(cherry picked from commit 37488b56d33533ad6d705c6d2e16eb6b5af67f65)
| -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 3909bca3a8da..ab6033667061 100644 --- a/sc/source/core/tool/formulagroup.cxx +++ b/sc/source/core/tool/formulagroup.cxx @@ -543,7 +543,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"); |