diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:12:07 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:20 +0100 |
| commit | c0bd59c15b4a6e8523693c8a354456b9fadb8832 (patch) | |
| tree | 67a35c16019355b6eac3faff74ce63d44eddfa96 /connectivity/source/cpool | |
| parent | 047239d5ca229bb8ad85a2d9fcd2ae7b6f35b976 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: Iefeeb51c2b101c097a8d77a4625f84baf1f2da44
Diffstat (limited to 'connectivity/source/cpool')
| -rw-r--r-- | connectivity/source/cpool/ZDriverWrapper.cxx | 6 | ||||
| -rw-r--r-- | connectivity/source/cpool/ZPoolCollection.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/cpool/Zregistration.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx index d780e3181e42..af6d2fba0488 100644 --- a/connectivity/source/cpool/ZDriverWrapper.cxx +++ b/connectivity/source/cpool/ZDriverWrapper.cxx @@ -44,7 +44,7 @@ namespace connectivity { // transfer the (one and only) real ref to the aggregate to our member m_xDriverAggregate = _rxAggregateDriver; - _rxAggregateDriver = NULL; + _rxAggregateDriver = nullptr; // a second "real" reference m_xDriver.set(m_xDriverAggregate, UNO_QUERY); @@ -60,11 +60,11 @@ namespace connectivity ODriverWrapper::~ODriverWrapper() { if (m_xDriverAggregate.is()) - m_xDriverAggregate->setDelegator(NULL); + m_xDriverAggregate->setDelegator(nullptr); if (m_pConnectionPool) m_pConnectionPool->release(); - m_pConnectionPool = NULL; + m_pConnectionPool = nullptr; } diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 1c9637a32a69..4e4bbc231863 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -297,7 +297,7 @@ OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName, const Reference< XDriver >& _xDriver, const Reference< XInterface >& _xDriverNode) { - OConnectionPool *pRet = 0; + OConnectionPool *pRet = nullptr; OConnectionPools::const_iterator aFind = m_aPools.find(_sImplName); if (aFind != m_aPools.end()) pRet = aFind->second; diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx index bd21ccf74659..d17800159fed 100644 --- a/connectivity/source/cpool/Zregistration.cxx +++ b/connectivity/source/cpool/Zregistration.cxx @@ -33,7 +33,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbpool2_component_getFactory(const sal_Char* _pImplName, void * _pServiceManager, void* /*_pRegistryKey*/) { - void* pRet = NULL; + void* pRet = nullptr; if (OPoolCollection::getImplementationName_Static().equalsAscii(_pImplName)) { |