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

Michael Stahl mstahl at redhat.com
Thu Sep 15 10:12:26 UTC 2016


 connectivity/source/drivers/firebird/Connection.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 86f6fc069f6ad8afea4092fb493014d2b69467d6
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Sep 15 12:08:47 2016 +0200

    connectivity: firebird: loplugin:nullptr
    
    Change-Id: Ia711be1238de87ac5b52b02de077b70220369e4b

diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index ba2998f..17528d7 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -590,7 +590,11 @@ void Connection::loadDatabaseFile(const OUString& srcLocation, const OUString& t
 isc_svc_handle Connection::attachServiceManager()
 {
     ISC_STATUS_ARRAY aStatusVector;
+#if SAL_TYPES_SIZEOFPOINTER == 8
     isc_svc_handle aServiceHandle = 0;
+#else
+    isc_svc_handle aServiceHandle = nullptr;
+#endif
 
     char aSPBBuffer[256];
     char* pSPB = aSPBBuffer;


More information about the Libreoffice-commits mailing list