connecitivty: [loplugin:nullptr]

Change-Id: Ic717e1d119e1a5b8a87caca263322d9e58fe6c68

4 files changed, 27 insertions, 2 deletions

diff --git a/connectivity/source/drivers/firebird/Blob.cxx b/connectivity/source/drivers/firebird/Blob.cxx
index 922887dab1c0..7a7481bb1367 100644
--- a/connectivity/source/drivers/firebird/Blob.cxx
+++ b/connectivity/source/drivers/firebird/Blob.cxx
@@ -33,7 +33,11 @@ Blob::Blob(isc_db_handle* pDatabaseHandle,
     m_pDatabaseHandle(pDatabaseHandle),
     m_pTransactionHandle(pTransactionHandle),
     m_blobID(aBlobID),
+#if SAL_TYPES_SIZEOFPOINTER == 8
     m_blobHandle(0),
+#else
+    m_blobHandle(nullptr),
+#endif
     m_bBlobOpened(false),
     m_nBlobLength(0),
     m_nBlobPosition(0)
@@ -103,7 +107,11 @@ void Blob::closeBlob()
             evaluateStatusVector(m_statusVector, "isc_close_blob", *this);
 
         m_bBlobOpened = false;
+#if SAL_TYPES_SIZEOFPOINTER == 8
         m_blobHandle = 0;
+#else
+        m_blobHandle = nullptr;
+#endif
     }
 }
 
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 979c677cf946..61e9836ec956 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -89,8 +89,13 @@ Connection::Connection(FirebirdDriver*    _pDriver)
     , m_bIsAutoCommit(false)
     , m_bIsReadOnly(false)
     , m_aTransactionIsolation(TransactionIsolation::REPEATABLE_READ)
+#if SAL_TYPES_SIZEOFPOINTER == 8
     , m_aDBHandle(0)
     , m_aTransactionHandle(0)
+#else
+    , m_aDBHandle(nullptr)
+    , m_aTransactionHandle(nullptr)
+#endif
     , m_xCatalog(nullptr)
     , m_xMetaData(nullptr)
     , m_aStatements()
@@ -773,7 +778,7 @@ void Connection::disposing()
         isc_rollback_transaction(status, &m_aTransactionHandle);
     }
 
-    if (m_aDBHandle != 0)
+    if (m_aDBHandle)
     {
         if (isc_detach_database(status, &m_aDBHandle))
         {
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index bce48fb312df..007714da0c5c 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -485,7 +485,11 @@ void SAL_CALL OPreparedStatement::setBlob(sal_Int32 nParameterIndex,
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 
+#if SAL_TYPES_SIZEOFPOINTER == 8
     isc_blob_handle aBlobHandle = 0;
+#else
+    isc_blob_handle aBlobHandle = nullptr;
+#endif
     ISC_QUAD aBlobId;
 
     openBlobForWriting(aBlobHandle, aBlobId);
@@ -585,7 +589,11 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 nParameterIndex,
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 
+#if SAL_TYPES_SIZEOFPOINTER == 8
     isc_blob_handle aBlobHandle = 0;
+#else
+    isc_blob_handle aBlobHandle = nullptr;
+#endif
     ISC_QUAD aBlobId;
 
     openBlobForWriting(aBlobHandle, aBlobId);
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index d1208e892a5e..bd1c4b7f23d1 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -47,7 +47,11 @@ OStatementCommonBase::OStatementCommonBase(Connection* _pConnection)
     : OStatementCommonBase_Base(m_aMutex),
       OPropertySetHelper(OStatementCommonBase_Base::rBHelper),
       m_pConnection(_pConnection),
-      m_aStatementHandle( 0 )
+#if SAL_TYPES_SIZEOFPOINTER == 8
+      m_aStatementHandle(0)
+#else
+      m_aStatementHandle(nullptr)
+#endif
 {
 }