From c0bd59c15b4a6e8523693c8a354456b9fadb8832 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 10 Nov 2015 10:12:07 +0100
Subject: loplugin:nullptr (automatic rewrite)

Change-Id: Iefeeb51c2b101c097a8d77a4625f84baf1f2da44
---
 connectivity/source/drivers/flat/EConnection.cxx | 2 +-
 connectivity/source/drivers/flat/EDriver.cxx     | 2 +-
 connectivity/source/drivers/flat/ETable.cxx      | 4 ++--
 connectivity/source/drivers/flat/Eservices.cxx   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'connectivity/source/drivers/flat')

diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index e3518e7dfe96..9c04ae0241e6 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -166,7 +166,7 @@ Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const OUS
     checkDisposed(OConnection_B::rBHelper.bDisposed);
 
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::prepareCall", *this );
-    return NULL;
+    return nullptr;
 }
 
 
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index 793d111e278f..d697fdc98134 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -62,7 +62,7 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S
        throw DisposedException();
 
     if ( ! acceptsURL(url) )
-        return NULL;
+        return nullptr;
 
     OFlatConnection* pCon = new OFlatConnection(this);
     pCon->construct(url,info);
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 7db929c164fe..08ae96d87982 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -514,7 +514,7 @@ void SAL_CALL OFlatTable::disposing()
 {
     OFileTable::disposing();
     ::osl::MutexGuard aGuard(m_aMutex);
-    m_aColumns = NULL;
+    m_aColumns = nullptr;
 }
 
 Sequence< Type > SAL_CALL OFlatTable::getTypes(  ) throw(RuntimeException, std::exception)
@@ -555,7 +555,7 @@ Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) throw(RuntimeExcep
 
 Sequence< sal_Int8 > OFlatTable::getUnoTunnelImplementationId()
 {
-    static ::cppu::OImplementationId * pId = 0;
+    static ::cppu::OImplementationId * pId = nullptr;
     if (! pId)
     {
         ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index 762bcc805945..bb5db84064fd 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -63,7 +63,7 @@ struct ProviderRequest
         {
             try
             {
-                xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
+                xRet = creator( xServiceManager, sImplementationName,Factory, Services,nullptr);
             }
             catch(...)
             {
@@ -81,7 +81,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL flat_component_getFactory(
                     void* pServiceManager,
                     void* /*pRegistryKey*/)
 {
-    void* pRet = 0;
+    void* pRet = nullptr;
     if (pServiceManager)
     {
         ProviderRequest aReq(pServiceManager,pImplementationName);
-- 
cgit