[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Kohei Yoshida]

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

New commits:
commit 30e2e49294731d4732f095779fd988b42f70f336
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Tue Dec 31 15:34:03 2013 -0500

    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)

diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index 3909bca..ab60336 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");