mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

connecitivty: [loplugin:nullptr]

Browse Source 
Change-Id: Ic717e1d119e1a5b8a87caca263322d9e58fe6c68
This commit is contained in:
Michael Stahl
2016-06-20 20:51:14 +02:00
parent 8ad0fb82d4
commit 3fecccad4a
4 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
connectivity/source/drivers/firebird/Blob.cxx
View File

@@ -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
}
}

7
connectivity/source/drivers/firebird/Connection.cxx
View File

@@ -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))
{

8
connectivity/source/drivers/firebird/PreparedStatement.cxx
View File

@@ -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);

6
connectivity/source/drivers/firebird/StatementCommonBase.cxx
View File

@@ -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
{
}