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

[Tor Lillqvist]

 opencl/source/openclwrapper.cxx          |    2 +-
 sc/source/core/opencl/formulagroupcl.cxx |    2 +-
 xmloff/source/draw/ximpshap.cxx          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6e70dc595e3291ff12c09c60b1e3ddf97a672aea
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jul 22 18:51:50 2016 +0300

    Add missing space
    
    Change-Id: I57d2fa94f6f4cc932f306de80897fc8071738c8c

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 6747bc9..aa11046 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -4054,7 +4054,7 @@ DynamicKernel* DynamicKernel::create( const ScCalcConfig& rConfig, ScTokenArray&
     {
         // I think OpenCLError exceptions are actually exceptional (unexpected), so do use SAL_WARN
         // here.
-        SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCLError from " << oce.mFunction << ": " << ::opencl::errorString(oce.mError) << "at " << oce.mFile << ":" << oce.mLineNumber);
+        SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCLError from " << oce.mFunction << ": " << ::opencl::errorString(oce.mError) << " at " << oce.mFile << ":" << oce.mLineNumber);
 
         // OpenCLError used to go to the catch-all below, and not delete pDynamicKernel. Was that
         // intentional, should we not do it here then either?
commit dbdfd36f8a176780115ed5f3a44b19ab90c2396c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jul 22 18:46:55 2016 +0300

    SAL_DETAIL_WHERE already ends with a space
    
    Change-Id: I273e0e4301246122bd9e02556b771dc485877350

diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index 9156ec2..d763dcc 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -49,7 +49,7 @@
 #define CHECK_OPENCL(status,name) \
 if( status != CL_SUCCESS )  \
 { \
-    SAL_WARN( "opencl", "OpenCL error code " << status << " at " SAL_DETAIL_WHERE " from " name ); \
+    SAL_WARN( "opencl", "OpenCL error code " << status << " at " SAL_DETAIL_WHERE "from " name ); \
     return false; \
 }
 
commit 61351e3e0dfe0ff809a7074bf06f32b3af15085f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jul 22 18:19:01 2016 +0300

    loplugin:nullptr
    
    Change-Id: I2084b360b9ee20c212bc5b44d4460551aff0a3d6

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 96a64c6..0d2ef7d 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3511,7 +3511,7 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPref
             SdXMLPluginShapeContext* pPluginContext = dynamic_cast<SdXMLPluginShapeContext*>(pShapeContext);
             if( pPluginContext && pPluginContext->getMimeType() == "model/vnd.gltf+json" )
             {
-                 mxImplContext = 0;
+                 mxImplContext = nullptr;
                  return this;
             }
         }