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

[Jagan Lokanatha]

 sc/source/core/opencl/opencl_device.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 40cd29a9660ef7945141ef96f60ef38781ade75f
Author: Jagan Lokanatha <Jagan.Lokanatha at amd.com>
Date:   Thu Nov 21 15:14:14 2013 -0500

    Ensure that when ds_profile is NULL, NATIVE_CPU is selected.
    
    Change-Id: Iab714a296ce0f807b5badd1ff96a99f3da2b24f8
    (cherry picked from commit 5556b1ffaf81543af680c1f68b79f36d7ad1785e)

diff --git a/sc/source/core/opencl/opencl_device.cxx b/sc/source/core/opencl/opencl_device.cxx
index 3eb415b..8f9f8ff 100644
--- a/sc/source/core/opencl/opencl_device.cxx
+++ b/sc/source/core/opencl/opencl_device.cxx
@@ -447,7 +447,7 @@ ds_device getDeviceSelection(const char* sProfilePath, bool bForceSelection)
         if (!profile)
         {
             // failed to initialize profile.
-            selectedDevice.oclDeviceID = NULL;
+            selectedDevice.type = DS_DEVICE_NATIVE_CPU;
             return selectedDevice;
         }