[Libreoffice-commits] core.git: sc/source

[Caolán McNamara]

 sc/source/core/tool/formulagroup.cxx |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 0fd7c40964db02749e1c07923580f7d2e7632edd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 9 21:05:31 2015 +0000

    coverity#1341778 Logically dead code
    
    Change-Id: I83b167c44b1cb14681c2e5a3a27277f2bedd36c6

diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index f2f8acf..4cbddf3 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -331,20 +331,14 @@ bool FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool
 
         return false;
     }
+
     bool bSuccess = ::opencl::switchOpenCLDevice(&rDeviceId, bAutoSelect, bForceEvaluation);
-    if(!bSuccess)
+    if (!bSuccess)
         return false;
 
     delete msInstance;
-    msInstance = nullptr;
-
-    if (bOpenCLEnabled)
-    {
-        msInstance = new sc::opencl::FormulaGroupInterpreterOpenCL();
-        return msInstance != nullptr;
-    }
-
-    return false;
+    msInstance = new sc::opencl::FormulaGroupInterpreterOpenCL();
+    return true;
 }
 
 void FormulaGroupInterpreter::getOpenCLDeviceInfo(sal_Int32& rDeviceId, sal_Int32& rPlatformId)