loplugin:nullptr (automatic rewrite)

Change-Id: I72bf3e008a8941d6e0fdea81b6b3e4a959ff28c5

75 files changed, 372 insertions, 372 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 7a39ce2e3050..b2f04092bb37 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -117,9 +117,9 @@ template<typename T> T CachedContentResultSet::rowOriginGet(
 
 CachedContentResultSet::CCRS_Cache::CCRS_Cache(
     const Reference< XContentIdentifierMapping > & xMapping )
-    : m_pResult( NULL )
+    : m_pResult( nullptr )
     , m_xContentIdentifierMapping( xMapping )
-    , m_pMappedReminder( NULL )
+    , m_pMappedReminder( nullptr )
 {
 }
 
@@ -134,7 +134,7 @@ void SAL_CALL CachedContentResultSet::CCRS_Cache
     if( m_pResult )
     {
         delete m_pResult;
-        m_pResult = NULL;
+        m_pResult = nullptr;
     }
     clearMappedReminder();
 }
@@ -252,7 +252,7 @@ void SAL_CALL CachedContentResultSet::CCRS_Cache
     ::clearMappedReminder()
 {
     delete m_pMappedReminder;
-    m_pMappedReminder = NULL;
+    m_pMappedReminder = nullptr;
 }
 
 Sequence< sal_Bool >* SAL_CALL CachedContentResultSet::CCRS_Cache
@@ -447,7 +447,7 @@ OUString    CCRS_PropertySetInfo::m_aPropertyNameForFetchDirection( "FetchDirect
 
 CCRS_PropertySetInfo::CCRS_PropertySetInfo(
         Reference< XPropertySetInfo > xInfo )
-        : m_pProperties( NULL )
+        : m_pProperties( nullptr )
         , m_nFetchSizePropertyHandle( -1 )
         , m_nFetchDirectionPropertyHandle( -1 )
 {
@@ -673,11 +673,11 @@ CachedContentResultSet::CachedContentResultSet(
                 : ContentResultSetWrapper( xOrigin )
 
                 , m_xContext( rxContext )
-                , m_xFetchProvider( NULL )
-                , m_xFetchProviderForContentAccess( NULL )
+                , m_xFetchProvider( nullptr )
+                , m_xFetchProviderForContentAccess( nullptr )
 
-                , m_xMyPropertySetInfo( NULL )
-                , m_pMyPropSetInfo( NULL )
+                , m_xMyPropertySetInfo( nullptr )
+                , m_pMyPropSetInfo( nullptr )
 
                 , m_xContentIdentifierMapping( xContentIdentifierMapping )
                 , m_nRow( 0 ) // Position is one-based. Zero means: before first element.
@@ -698,7 +698,7 @@ CachedContentResultSet::CachedContentResultSet(
                 , m_aCacheContentIdentifier( m_xContentIdentifierMapping )
                 , m_aCacheContent( m_xContentIdentifierMapping )
                 , m_bTriedToGetTypeConverter( false )
-                , m_xTypeConverter( NULL )
+                , m_xTypeConverter( nullptr )
 {
     m_xFetchProvider.set( m_xResultSetOrigin, UNO_QUERY );
     OSL_ENSURE( m_xFetchProvider.is(), "interface XFetchProvider is required" );
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index efa4d14447e7..aa0d9ce01a0b 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -141,7 +141,7 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub
     ::getTypes()
     throw( RuntimeException, std::exception )
 {
-    static Sequence< Type >* pTypes = NULL;
+    static Sequence< Type >* pTypes = nullptr;
     if( !pTypes )
     {
         osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
@@ -340,7 +340,7 @@ void SAL_CALL CachedContentResultSetStub
     Sequence< Any > aContent( nCount );
     for( sal_Int32 nN = 1; nN <= nCount; nN++ )
     {
-        aContent[nN-1] = xRow->getObject( nN, NULL );
+        aContent[nN-1] = xRow->getObject( nN, nullptr );
     }
 
     rRowContent <<= aContent;
@@ -568,7 +568,7 @@ Reference< XResultSet > SAL_CALL CachedContentResultSetStubFactory
         xRet = new CachedContentResultSetStub( xSource );
         return xRet;
     }
-    return NULL;
+    return nullptr;
 }
 
 
diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx
index ac110d864ea9..47c149582f60 100644
--- a/ucb/source/cacher/cacheserv.cxx
+++ b/ucb/source/cacher/cacheserv.cxx
@@ -34,7 +34,7 @@ using namespace com::sun::star::registry;
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cached1_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
-    void * pRet = 0;
+    void * pRet = nullptr;
 
     Reference< XMultiServiceFactory > xSMgr(
             static_cast< XMultiServiceFactory * >( pServiceManager ) );
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index e606b36bff65..6390550c8efd 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -45,17 +45,17 @@ using namespace cppu;
 ContentResultSetWrapper::ContentResultSetWrapper(
                                 Reference< XResultSet > xOrigin )
                 : m_xResultSetOrigin( xOrigin )
-                , m_xRowOrigin( NULL )
-                , m_xContentAccessOrigin( NULL )
-                , m_xPropertySetOrigin( NULL )
-                , m_xPropertySetInfo( NULL )
+                , m_xRowOrigin( nullptr )
+                , m_xContentAccessOrigin( nullptr )
+                , m_xPropertySetOrigin( nullptr )
+                , m_xPropertySetInfo( nullptr )
                 , m_nForwardOnly( 2 )
-                , m_xMetaDataFromOrigin( NULL )
+                , m_xMetaDataFromOrigin( nullptr )
                 , m_bDisposed( false )
                 , m_bInDispose( false )
-                , m_pDisposeEventListeners( NULL )
-                , m_pPropertyChangeListeners( NULL )
-                , m_pVetoableChangeListeners( NULL )
+                , m_pDisposeEventListeners( nullptr )
+                , m_pPropertyChangeListeners( nullptr )
+                , m_pVetoableChangeListeners( nullptr )
 {
     m_pMyListenerImpl = new ContentResultSetWrapperListener( this );
     m_xMyListenerImpl.set( m_pMyListenerImpl );
@@ -1394,7 +1394,7 @@ void SAL_CALL ContentResultSetWrapperListener::vetoableChange( const PropertyCha
 
 void SAL_CALL ContentResultSetWrapperListener::impl_OwnerDies()
 {
-    m_pOwner = NULL;
+    m_pOwner = nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx
index 2767b870d9ca..138856ce27d2 100644
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
@@ -80,7 +80,7 @@ protected:
             if(pT)
             {
                 pT->release();
-                pT = NULL;
+                pT = nullptr;
             }
         }
 
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index fc25344e0297..b3f30b3c7115 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -45,18 +45,18 @@ DynamicResultSetWrapper::DynamicResultSetWrapper(
 
                 : m_bDisposed( false )
                 , m_bInDispose( false )
-                , m_pDisposeEventListeners( NULL )
+                , m_pDisposeEventListeners( nullptr )
                 , m_xContext( rxContext )
                 , m_bStatic( false )
                 , m_bGotWelcome( false )
                 , m_xSource( xOrigin )
-                , m_xSourceResultOne( NULL )
-                , m_xSourceResultTwo( NULL )
+                , m_xSourceResultOne( nullptr )
+                , m_xSourceResultTwo( nullptr )
             //  , m_xSourceResultCurrent( NULL )
             //  , m_bUseOne( NULL )
-                , m_xMyResultOne( NULL )
-                , m_xMyResultTwo( NULL )
-                , m_xListener( NULL )
+                , m_xMyResultOne( nullptr )
+                , m_xMyResultTwo( nullptr )
+                , m_xListener( nullptr )
 {
     m_pMyListenerImpl = new DynamicResultSetWrapperListener( this );
     m_xMyListenerImpl.set( m_pMyListenerImpl );
@@ -68,11 +68,11 @@ void SAL_CALL DynamicResultSetWrapper::impl_init()
     //call this at the end of constructor of derived class
 
 
-    Reference< XDynamicResultSet > xSource = NULL;
+    Reference< XDynamicResultSet > xSource = nullptr;
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
         xSource = m_xSource;
-        m_xSource = NULL;
+        m_xSource = nullptr;
     }
     if( xSource.is() )
         setSource( xSource );
@@ -302,8 +302,8 @@ void SAL_CALL DynamicResultSetWrapper::setSource( const Reference< XInterface >
     OSL_ENSURE( xSourceDynamic.is(),
         "the given source is not of required type XDynamicResultSet" );
 
-    Reference< XDynamicResultSetListener > xListener = NULL;
-    Reference< XDynamicResultSetListener > xMyListenerImpl = NULL;
+    Reference< XDynamicResultSetListener > xListener = nullptr;
+    Reference< XDynamicResultSetListener > xMyListenerImpl = nullptr;
 
     bool bStatic = false;
     {
@@ -332,8 +332,8 @@ Reference< XResultSet > SAL_CALL DynamicResultSetWrapper::getStaticResultSet()
 {
     impl_EnsureNotDisposed();
 
-    Reference< XDynamicResultSet > xSource = NULL;
-    Reference< XEventListener > xMyListenerImpl = NULL;
+    Reference< XDynamicResultSet > xSource = nullptr;
+    Reference< XEventListener > xMyListenerImpl = nullptr;
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
         if( m_xListener.is() )
@@ -363,8 +363,8 @@ void SAL_CALL DynamicResultSetWrapper::setListener( const Reference< XDynamicRes
 {
     impl_EnsureNotDisposed();
 
-    Reference< XDynamicResultSet > xSource = NULL;
-    Reference< XDynamicResultSetListener > xMyListenerImpl = NULL;
+    Reference< XDynamicResultSet > xSource = nullptr;
+    Reference< XDynamicResultSetListener > xMyListenerImpl = nullptr;
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
         if( m_xListener.is() )
@@ -413,7 +413,7 @@ void SAL_CALL DynamicResultSetWrapper::connectToCache( const Reference< XDynamic
         if( xStubFactory.is() )
         {
             xStubFactory->connectToCache(
-                  this, xCache, Sequence< NumberedSortingInfo > (), NULL );
+                  this, xCache, Sequence< NumberedSortingInfo > (), nullptr );
             return;
         }
     }
@@ -428,7 +428,7 @@ sal_Int16 SAL_CALL DynamicResultSetWrapper::getCapabilities()
     impl_EnsureNotDisposed();
 
     m_aSourceSet.wait();
-    Reference< XDynamicResultSet > xSource = NULL;
+    Reference< XDynamicResultSet > xSource = nullptr;
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
         xSource = m_xSource;
@@ -509,7 +509,7 @@ void SAL_CALL DynamicResultSetWrapperListener::impl_OwnerDies()
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
-    m_pOwner = NULL;
+    m_pOwner = nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 590f57bb5c3f..45f4e46ea9e6 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -95,7 +95,7 @@ class OFileAccess : public FileAccessHelper
 
 public:
     explicit OFileAccess( const Reference< XComponentContext > & xContext )
-        : m_xContext( xContext), mpEnvironment( NULL ) {}
+        : m_xContext( xContext), mpEnvironment( nullptr ) {}
     // Methods
     virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
@@ -463,7 +463,7 @@ Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL,
 {
     // SfxContentHelper::GetFolderContents
 
-    StringList_Impl* pFiles = NULL;
+    StringList_Impl* pFiles = nullptr;
     INetURLObject aFolderObj( FolderURL, INetProtocol::File );
 
     ucbhelper::Content aCnt( aFolderObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
@@ -589,7 +589,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL )
     if ( mpEnvironment )
     {
         xIH = mpEnvironment->getInteractionHandler();
-        mpEnvironment->setHandler( 0 );
+        mpEnvironment->setHandler( nullptr );
     }
 
     try
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index 70d3d94c61da..438f0c8c7959 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -273,7 +273,7 @@ UcbContentProviderProxy::deregisterInstance( const OUString& Template,
     if ( m_bRegister && m_xTargetProvider.is() )
     {
         m_bRegister       = false;
-        m_xTargetProvider = 0;
+        m_xTargetProvider = nullptr;
 
         Reference< XParameterizedContentProvider >
                                 xParamProvider( m_xProvider, UNO_QUERY );
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index d6932477a729..8b5bac6b6a1e 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -229,7 +229,7 @@ bool createContentProviderData(
 UniversalContentBroker::UniversalContentBroker(
     const Reference< css::uno::XComponentContext >& xContext )
 : m_xContext( xContext ),
-  m_pDisposeEventListeners( NULL ),
+  m_pDisposeEventListeners( nullptr ),
   m_nInitCount( 0 ), //@@@ see initialize() method
   m_nCommandId( 0 )
 {
@@ -418,7 +418,7 @@ UniversalContentBroker::registerContentProvider(
     }
     catch (const IllegalArgumentException&)
     {
-        return 0; //@@@
+        return nullptr; //@@@
     }
 
     Reference< XContentProvider > xPrevious;
@@ -432,7 +432,7 @@ UniversalContentBroker::registerContentProvider(
         }
         catch (const IllegalArgumentException&)
         {
-            return 0; //@@@
+            return nullptr; //@@@
         }
     }
     else
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 67b3662acf9c..10f97d50f950 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -1001,7 +1001,7 @@ uno::Reference< sdbc::XResultSet > getResultSet(
     ucb::OpenCommandArgument2 aArg;
     aArg.Mode       = ucb::OpenMode::ALL;
     aArg.Priority   = 0; // unused
-    aArg.Sink       = 0;
+    aArg.Sink       = nullptr;
     aArg.Properties = aProps;
 
     ucb::Command aOpenCommand( OUString("open"),
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index 3b33c8567c01..cb5a806325ce 100644
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -33,7 +33,7 @@ using namespace com::sun::star::lang;
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucb_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
-    void * pRet = 0;
+    void * pRet = nullptr;
 
     Reference< XMultiServiceFactory > xSMgr(
             static_cast< XMultiServiceFactory * >( pServiceManager ) );
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 3e3344a751bf..b0f7acd3ebc3 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -129,7 +129,7 @@ public:
         throw( RuntimeException, std::exception ) override;
 
     // Non-interface methods.
-    void reset() { delete m_pProps; m_pProps = 0; }
+    void reset() { delete m_pProps; m_pProps = nullptr; }
 };
 
 
@@ -1109,9 +1109,9 @@ struct PersistentPropertySet_Impl
 
     PersistentPropertySet_Impl( PropertySetRegistry& rCreator,
                                 const OUString& rKey )
-    : m_pCreator( &rCreator ), m_pInfo( NULL ), m_aKey( rKey ),
-      m_pDisposeEventListeners( NULL ), m_pPropSetChangeListeners( NULL ),
-      m_pPropertyChangeListeners( NULL )
+    : m_pCreator( &rCreator ), m_pInfo( nullptr ), m_aKey( rKey ),
+      m_pDisposeEventListeners( nullptr ), m_pPropSetChangeListeners( nullptr ),
+      m_pPropertyChangeListeners( nullptr )
     {
         m_pCreator->acquire();
     }
@@ -2204,7 +2204,7 @@ PropertySetInfo_Impl::PropertySetInfo_Impl(
                         const Reference< XComponentContext >& xContext,
                         PersistentPropertySet* pOwner )
 : m_xContext( xContext ),
-  m_pProps( NULL ),
+  m_pProps( nullptr ),
   m_pOwner( pOwner )
 {
 }
diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx
index 33fc1aa49e5a..7485e1e6e5f9 100644
--- a/ucb/source/inc/regexpmap.hxx
+++ b/ucb/source/inc/regexpmap.hxx
@@ -433,9 +433,9 @@ public:
     RegexpMap & operator =(RegexpMap const & rOther);
 
     bool add(OUString const & rKey, Val const & rValue, bool bOverwrite,
-             OUString * pReverse = 0);
+             OUString * pReverse = nullptr);
 
-    iterator find(OUString const & rKey, OUString * pReverse = 0);
+    iterator find(OUString const & rKey, OUString * pReverse = nullptr);
 
     void erase(iterator const & rPos);
 
@@ -450,7 +450,7 @@ public:
     size_type size() const;
 
     Val const * map(OUString const & rString,
-                    OUString * pTranslation = 0, bool * pTranslated = 0)
+                    OUString * pTranslation = nullptr, bool * pTranslated = nullptr)
         const;
 
 private:
diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx
index 5856dbf7a6f7..76688d3f103e 100644
--- a/ucb/source/regexp/regexp.cxx
+++ b/ucb/source/regexp/regexp.cxx
@@ -99,8 +99,8 @@ bool Regexp::matches(OUString const & rString,
         sal_Unicode const * pBlock1Begin = p;
         sal_Unicode const * pBlock1End = pEnd;
 
-        sal_Unicode const * pBlock2Begin = 0;
-        sal_Unicode const * pBlock2End = 0;
+        sal_Unicode const * pBlock2Begin = nullptr;
+        sal_Unicode const * pBlock2End = nullptr;
 
         switch (m_eKind)
         {
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 9725ad87b319..0030cdc6a731 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -39,7 +39,7 @@ using namespace cppu;
 //  The mutex to synchronize access to containers.
 static osl::Mutex& getContainerMutex()
 {
-    static osl::Mutex* pMutex = NULL;
+    static osl::Mutex* pMutex = nullptr;
     if( !pMutex )
     {
         osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
@@ -62,7 +62,7 @@ SortedDynamicResultSet::SortedDynamicResultSet(
                         const Reference < XAnyCompareFactory > &xCompFac,
                         const Reference < XComponentContext > &rxContext )
 {
-    mpDisposeEventListeners = NULL;
+    mpDisposeEventListeners = nullptr;
     mpOwnListener           = new SortedDynamicResultSetListener( this );
 
     mxOwnListener.set( mpOwnListener );
@@ -72,8 +72,8 @@ SortedDynamicResultSet::SortedDynamicResultSet(
     mxCompFac   = xCompFac;
     m_xContext  = rxContext;
 
-    mpOne = NULL;
-    mpTwo = NULL;
+    mpOne = nullptr;
+    mpTwo = nullptr;
 
     mbGotWelcome    = false;
     mbUseOne        = true;
@@ -92,8 +92,8 @@ SortedDynamicResultSet::~SortedDynamicResultSet()
     mxTwo.clear();
     mxOriginal.clear();
 
-    mpOne = NULL;
-    mpTwo = NULL;
+    mpOne = nullptr;
+    mpTwo = nullptr;
 }
 
 // XServiceInfo methods.
@@ -146,8 +146,8 @@ void SAL_CALL SortedDynamicResultSet::dispose()
     mxTwo.clear();
     mxOriginal.clear();
 
-    mpOne = NULL;
-    mpTwo = NULL;
+    mpOne = nullptr;
+    mpTwo = nullptr;
     mbUseOne = true;
 }
 
@@ -245,7 +245,7 @@ SortedDynamicResultSet::connectToCache( const Reference< XDynamicResultSet > & x
         if( xStubFactory.is() )
         {
             xStubFactory->connectToCache(
-                  this, xCache, Sequence< NumberedSortingInfo > (), NULL );
+                  this, xCache, Sequence< NumberedSortingInfo > (), nullptr );
             return;
         }
     }
@@ -295,7 +295,7 @@ void SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
     bool bHasNew = false;
     bool bHasModified = false;
 
-    SortedResultSet *pCurSet = NULL;
+    SortedResultSet *pCurSet = nullptr;
 
     // exchange mxNew and mxOld and immediately afterwards copy the tables
     // from Old to New
@@ -600,7 +600,7 @@ void SAL_CALL
 SortedDynamicResultSetListener::impl_OwnerDies()
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
-    mpOwner = NULL;
+    mpOwner = nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx
index a1b5e1ea8bf6..83300d8a1a93 100644
--- a/ucb/source/sorter/sortmain.cxx
+++ b/ucb/source/sorter/sortmain.cxx
@@ -29,7 +29,7 @@ using namespace com::sun::star::lang;
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL srtrs1_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
-    void * pRet = 0;
+    void * pRet = nullptr;
 
     Reference< XMultiServiceFactory > xSMgr(
             static_cast< XMultiServiceFactory * >( pServiceManager ) );
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 64d3ec07d96d..1a4707e75212 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -48,7 +48,7 @@ using namespace cppu;
 //  The mutex to synchronize access to containers.
 static osl::Mutex& getContainerMutex()
 {
-    static osl::Mutex* pMutex = NULL;
+    static osl::Mutex* pMutex = nullptr;
     if( !pMutex )
     {
         osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
@@ -125,13 +125,13 @@ public:
 
 SortedResultSet::SortedResultSet( Reference< XResultSet > aResult )
 {
-    mpDisposeEventListeners = NULL;
-    mpPropChangeListeners   = NULL;
-    mpVetoChangeListeners   = NULL;
-    mpPropSetInfo           = NULL;
+    mpDisposeEventListeners = nullptr;
+    mpPropChangeListeners   = nullptr;
+    mpVetoChangeListeners   = nullptr;
+    mpPropSetInfo           = nullptr;
 
     mxOriginal  = aResult;
-    mpSortInfo  = NULL;
+    mpSortInfo  = nullptr;
     mnLastSort  = 0;
     mnCurEntry  = 0;
     mnCount     = 0;
@@ -155,7 +155,7 @@ SortedResultSet::~SortedResultSet()
         }
     }
 
-    mpSortInfo = NULL;
+    mpSortInfo = nullptr;
 
     if ( mpPropSetInfo )
         mpPropSetInfo->release();
@@ -1211,9 +1211,9 @@ sal_IntPtr SortedResultSet::CompareImpl( Reference < XResultSet > xResultOne,
                             Reference< XRow >::query( xResultTwo );
 
             if ( xResultOne->absolute( nIndexOne ) )
-                aOne = xRowOne->getObject( pInfo->mnColumn, NULL );
+                aOne = xRowOne->getObject( pInfo->mnColumn, nullptr );
             if ( xResultTwo->absolute( nIndexTwo ) )
-                aTwo = xRowTwo->getObject( pInfo->mnColumn, NULL );
+                aTwo = xRowTwo->getObject( pInfo->mnColumn, nullptr );
 
             nCompare = pInfo->mxCompareFunction->compare( aOne, aTwo );
         }
@@ -1355,8 +1355,8 @@ void SortedResultSet::CopyData( SortedResultSet *pSource )
     maO2S.Clear();
     maModList.Clear();
 
-    maS2O.Insert( NULL, 0 );
-    maO2S.Insert( 0, (sal_uInt32) 0 );  // value, pos
+    maS2O.Insert( nullptr, 0 );
+    maO2S.Insert( nullptr, (sal_uInt32) 0 );  // value, pos
 
     nCount = rSrcS2O.Count();
 
@@ -1410,7 +1410,7 @@ void SortedResultSet::Initialize(
     // when we have fetched all the elements, we can create the
     // original to sorted mapping list from the s2o list
     maO2S.Clear();
-    maO2S.Insert( NULL, (sal_uInt32) 0 );
+    maO2S.Insert( nullptr, (sal_uInt32) 0 );
 
     // insert some dummy entries first and replace then
     // the entries with the right ones
@@ -1843,7 +1843,7 @@ SortListData* SortedEntryList::Remove( sal_IntPtr nPos )
         maData.erase( maData.begin() + nPos );
     }
     else
-        pData = NULL;
+        pData = nullptr;
 
     return pData;
 }
@@ -1856,7 +1856,7 @@ SortListData* SortedEntryList::GetData( sal_IntPtr nPos )
     if ( nPos < (sal_IntPtr) maData.size() )
         pData = maData[ nPos ];
     else
-        pData = NULL;
+        pData = nullptr;
 
     return pData;
 }
@@ -1869,7 +1869,7 @@ sal_IntPtr SortedEntryList::operator [] ( sal_IntPtr nPos ) const
     if ( nPos < (sal_IntPtr) maData.size() )
         pData = maData[ nPos ];
     else
-        pData = NULL;
+        pData = nullptr;
 
     if ( pData )
         if ( ! pData->mbModified )
@@ -1931,7 +1931,7 @@ void* SimpleList::GetObject( sal_uInt32 nPos ) const
     if ( nPos < (sal_uInt32) maData.size() )
         return maData[ nPos ];
     else
-        return NULL;
+        return nullptr;
 }
 
 
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 16c1298aa910..6cf2f195e8f8 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -235,7 +235,7 @@ namespace
             for ( sal_Int32 i = 0; i < m_nNumValue; ++i )
             {
                 OUStringBuffer aBuffer;
-                ::sax::Converter::convertDateTime( aBuffer, seqValue[i], 0 );
+                ::sax::Converter::convertDateTime( aBuffer, seqValue[i], nullptr );
                 values.push_back( OUSTR_TO_STDSTR( aBuffer.makeStringAndClear( )  ) );
             }
             type = libcmis::PropertyType::DateTime;
@@ -289,7 +289,7 @@ namespace cmis
             throw ( ucb::ContentCreationException )
         : ContentImplHelper( rxContext, pProvider, Identifier ),
         m_pProvider( pProvider ),
-        m_pSession( NULL ),
+        m_pSession( nullptr ),
         m_pObject( pObject ),
         m_sURL( Identifier->getContentIdentifier( ) ),
         m_aURL( Identifier->getContentIdentifier( ) ),
@@ -308,7 +308,7 @@ namespace cmis
             throw ( ucb::ContentCreationException )
         : ContentImplHelper( rxContext, pProvider, Identifier ),
         m_pProvider( pProvider ),
-        m_pSession( NULL ),
+        m_pSession( nullptr ),
         m_sURL( Identifier->getContentIdentifier( ) ),
         m_aURL( Identifier->getContentIdentifier( ) ),
         m_bTransient( true ),
@@ -338,10 +338,10 @@ namespace cmis
 
         // Look for a cached session, key is binding url + repo id
         OUString sSessionId = m_aURL.getBindingUrl( ) + m_aURL.getRepositoryId( );
-        if ( NULL == m_pSession )
+        if ( nullptr == m_pSession )
             m_pSession = m_pProvider->getSession( sSessionId, m_aURL.getUsername( ) );
 
-        if ( NULL == m_pSession )
+        if ( nullptr == m_pSession )
         {
 #ifndef SYSTEM_CURL
             // Initialize NSS library to make sure libcmis (and curl) can access CACERTs using NSS
@@ -430,14 +430,14 @@ namespace cmis
 
     libcmis::ObjectTypePtr Content::getObjectType( const uno::Reference< ucb::XCommandEnvironment >& xEnv )
     {
-        if ( NULL == m_pObjectType.get( ) && m_bTransient )
+        if ( nullptr == m_pObjectType.get( ) && m_bTransient )
         {
             string typeId = m_bIsFolder ? "cmis:folder" : "cmis:document";
             // The type to create needs to be fetched from the possible children types
             // defined in the parent folder. Then, we'll pick up the first one we find matching
             // cmis:folder or cmis:document (depending what we need to create).
             // The easy case will work in most cases, but not on some servers (like Lotus Live)
-            libcmis::Folder* pParent = NULL;
+            libcmis::Folder* pParent = nullptr;
             bool bTypeRestricted = false;
             try
             {
@@ -754,7 +754,7 @@ namespace cmis
                     try
                     {
                         libcmis::Document* document = dynamic_cast< libcmis::Document* >( getObject( xEnv ).get( ) );
-                        if ( NULL != document )
+                        if ( nullptr != document )
                             xRow->appendLong( rProp, document->getContentLength() );
                         else
                             xRow->appendVoid( rProp );
@@ -773,7 +773,7 @@ namespace cmis
                     try
                     {
                         libcmis::Document* document = dynamic_cast< libcmis::Document* >( getObject( xEnv ).get( ) );
-                        if ( NULL != document )
+                        if ( nullptr != document )
                             xRow->appendString( rProp, STD_TO_OUSTR( document->getContentType() ) );
                         else
                             xRow->appendVoid( rProp );
@@ -1076,7 +1076,7 @@ namespace cmis
         {
             // Checkout the document if possible
             libcmis::DocumentPtr pDoc = boost::dynamic_pointer_cast< libcmis::Document >( getObject( xEnv ) );
-            if ( pDoc.get( ) == NULL )
+            if ( pDoc.get( ) == nullptr )
             {
                 ucbhelper::cancelCommandExecution(
                                     ucb::IOErrorCode_GENERAL,
@@ -1122,7 +1122,7 @@ namespace cmis
         try
         {
             libcmis::DocumentPtr pPwc = boost::dynamic_pointer_cast< libcmis::Document >( getObject( xEnv ) );
-            if ( pPwc.get( ) == NULL )
+            if ( pPwc.get( ) == nullptr )
             {
                 ucbhelper::cancelCommandExecution(
                                     ucb::IOErrorCode_GENERAL,
@@ -1188,7 +1188,7 @@ namespace cmis
         {
             // get the document
             libcmis::DocumentPtr pDoc = boost::dynamic_pointer_cast< libcmis::Document >( getObject( xEnv ) );
-            if ( pDoc.get( ) == NULL )
+            if ( pDoc.get( ) == nullptr )
             {
                 ucbhelper::cancelCommandExecution(
                                     ucb::IOErrorCode_GENERAL,
@@ -1273,7 +1273,7 @@ namespace cmis
             {
             }
 
-            if ( pFolder != 0 )
+            if ( pFolder != nullptr )
             {
                 libcmis::ObjectPtr object;
                 map< string, libcmis::PropertyPtr >::iterator it = m_pObjectProps.find( "cmis:name" );
@@ -1302,7 +1302,7 @@ namespace cmis
                     // Nothing matched the path
                 }
 
-                if ( NULL != object.get( ) )
+                if ( nullptr != object.get( ) )
                 {
                     // Are the base type matching?
                     if ( object->getBaseType( ) != m_pObjectType->getBaseType( )->getId() )
@@ -1315,7 +1315,7 @@ namespace cmis
 
                     // Update the existing object if it's a document
                     libcmis::Document* document = dynamic_cast< libcmis::Document* >( object.get( ) );
-                    if ( NULL != document )
+                    if ( nullptr != document )
                     {
                         boost::shared_ptr< ostream > pOut( new ostringstream ( ios_base::binary | ios_base::in | ios_base::out ) );
                         uno::Reference < io::XOutputStream > xOutput = new ucbhelper::StdOutputStream( pOut );
@@ -2006,7 +2006,7 @@ namespace cmis
         SAL_INFO( "ucb.ucp.cmis", "Content::getChildren() " << m_sURL );
 
         libcmis::FolderPtr pFolder = boost::dynamic_pointer_cast< libcmis::Folder >( getObject( uno::Reference< ucb::XCommandEnvironment >() ) );
-        if ( 0 != pFolder )
+        if ( nullptr != pFolder )
         {
             // Get the children from pObject
             try
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index 292da1b83e6a..0f3f6a63d624 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -60,7 +60,7 @@ ContentProvider::queryContent(
 
 libcmis::Session* ContentProvider::getSession( const OUString& sBindingUrl, const OUString& sUsername )
 {
-    libcmis::Session* pSession = NULL;
+    libcmis::Session* pSession = nullptr;
     std::map< std::pair< OUString, OUString >, libcmis::Session* >::iterator it
             = m_aSessionCache.find( std::pair< OUString, OUString >( sBindingUrl, sUsername ) );
     if ( it != m_aSessionCache.end( ) )
@@ -129,7 +129,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpcmis1_component_getFactory( const sal_Char *pImplName,
     void *pServiceManager, void * )
 {
-    void * pRet = 0;
+    void * pRet = nullptr;
 
     uno::Reference< lang::XMultiServiceFactory > xSMgr
         (static_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 40d88c769b7c..644c5c2a3569 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -231,7 +231,7 @@ namespace cmis
         if ( !m_sRepositoryId.isEmpty() )
         {
             for ( vector< libcmis::RepositoryPtr >::iterator it = m_aRepositories.begin( );
-                    it != m_aRepositories.end( ) && NULL == repo.get( ); ++it )
+                    it != m_aRepositories.end( ) && nullptr == repo.get( ); ++it )
             {
                 if ( STD_TO_OUSTR( ( *it )->getId( ) ) == m_sRepositoryId )
                     repo = *it;
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index b02ddfa36a55..9fa5b4d9064b 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -233,9 +233,9 @@ static const ::cppu::ImplementationEntry s_entries [] =
         implName,
         supportedServices,
         ::cppu::createSingleComponentFactory,
-        0, 0
+        nullptr, 0
     },
-    { 0, 0, 0, 0, 0, 0 }
+    { nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
 };
 
 }
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 10e60ded83dd..72c58379e14e 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -515,7 +515,7 @@ namespace ucb { namespace ucp { namespace ext
         }
 
         OSL_FAIL( "Content::getPropertyValues: unreachable!" );
-        return NULL;
+        return nullptr;
     }
 
 
@@ -628,7 +628,7 @@ namespace ucb { namespace ucp { namespace ext
         {
             Sequence< Property > aProps(1);
             aProps[0].Name = "IsFolder";
-            Reference< XRow > xRow( getPropertyValues( aProps, NULL ), UNO_SET_THROW );
+            Reference< XRow > xRow( getPropertyValues( aProps, nullptr ), UNO_SET_THROW );
             bIsFolder = xRow->getBoolean(1);
         }
         catch( const Exception& )
@@ -652,7 +652,7 @@ namespace ucb { namespace ucp { namespace ext
             {
                 Sequence< Property > aProps(1);
                 aProps[0].Name = "ContentType";
-                Reference< XRow > xRow( getPropertyValues( aProps, NULL ), UNO_SET_THROW );
+                Reference< XRow > xRow( getPropertyValues( aProps, nullptr ), UNO_SET_THROW );
                 m_aContentType.reset( xRow->getString(1) );
             }
             catch( const Exception& )
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
index 7a249f83c0fb..4d794a656f39 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
@@ -243,7 +243,7 @@ namespace ucb { namespace ucp { namespace ext
     Reference< XContent > DataSupplier::queryContent( sal_uInt32 i_nIndex )
     {
         ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex );
-        ENSURE_OR_RETURN( i_nIndex < m_pImpl->m_aResults.size(), "illegal index!", NULL );
+        ENSURE_OR_RETURN( i_nIndex < m_pImpl->m_aResults.size(), "illegal index!", nullptr );
 
 
         ::rtl::Reference< Content > pContent( m_pImpl->m_aResults[ i_nIndex ].pContent );
@@ -306,13 +306,13 @@ namespace ucb { namespace ucp { namespace ext
     Reference< XRow > DataSupplier::queryPropertyValues( sal_uInt32 i_nIndex  )
     {
         ::osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-        ENSURE_OR_RETURN( i_nIndex < m_pImpl->m_aResults.size(), "DataSupplier::queryPropertyValues: illegal index!", NULL );
+        ENSURE_OR_RETURN( i_nIndex < m_pImpl->m_aResults.size(), "DataSupplier::queryPropertyValues: illegal index!", nullptr );
 
         Reference< XRow > xRow = m_pImpl->m_aResults[ i_nIndex ].xRow;
         if ( xRow.is() )
             return xRow;
 
-        ENSURE_OR_RETURN( queryContent( i_nIndex ).is(), "could not retrieve the content", NULL );
+        ENSURE_OR_RETURN( queryContent( i_nIndex ).is(), "could not retrieve the content", nullptr );
 
         switch ( m_pImpl->m_xContent->getExtensionContentType() )
         {
diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx
index 19c6b0178f3b..9c094118c170 100644
--- a/ucb/source/ucp/ext/ucpext_services.cxx
+++ b/ucb/source/ucp/ext/ucpext_services.cxx
@@ -48,9 +48,9 @@ namespace ucb { namespace ucp { namespace ext
             ContentProvider::Create,
             ContentProvider::getImplementationName_static,
             ContentProvider::getSupportedServiceNames_static,
-            ::cppu::createOneInstanceComponentFactory, NULL, 0
+            ::cppu::createOneInstanceComponentFactory, nullptr, 0
         },
-        { 0, 0, 0, 0, 0, 0 }
+        { nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
     };
 
 
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 82e3f292c1cb..f55962484a21 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -82,14 +82,14 @@ BaseContent::BaseContent( shell* pMyShell,
                           const OUString& parentName,
                           bool bFolder )
     : m_pMyShell( pMyShell ),
-      m_xContentIdentifier( 0 ),
+      m_xContentIdentifier( nullptr ),
       m_aUncPath( parentName ),
       m_bFolder( bFolder ),
       m_nState( JustInserted ),
-      m_pDisposeEventListeners( 0 ),
-      m_pContentEventListeners( 0 ),
-      m_pPropertySetInfoChangeListeners( 0 ),
-      m_pPropertyListener( 0 )
+      m_pDisposeEventListeners( nullptr ),
+      m_pContentEventListeners( nullptr ),
+      m_pPropertySetInfoChangeListeners( nullptr ),
+      m_pPropertyListener( nullptr )
 {
     m_pMyShell->m_pProvider->acquire();
     // No registering, since we have no name
@@ -107,10 +107,10 @@ BaseContent::BaseContent( shell* pMyShell,
       m_aUncPath( aUncPath ),
       m_bFolder( false ),
       m_nState( FullFeatured ),
-      m_pDisposeEventListeners( 0 ),
-      m_pContentEventListeners( 0 ),
-      m_pPropertySetInfoChangeListeners( 0 ),
-      m_pPropertyListener( 0 )
+      m_pDisposeEventListeners( nullptr ),
+      m_pContentEventListeners( nullptr ),
+      m_pPropertySetInfoChangeListeners( nullptr ),
+      m_pPropertyListener( nullptr )
 {
     m_pMyShell->m_pProvider->acquire();
     m_pMyShell->registerNotifier( m_aUncPath,this );
@@ -219,17 +219,17 @@ BaseContent::dispose()
 
 
         pDisposeEventListeners =
-            m_pDisposeEventListeners, m_pDisposeEventListeners = 0;
+            m_pDisposeEventListeners, m_pDisposeEventListeners = nullptr;
 
         pContentEventListeners =
-            m_pContentEventListeners, m_pContentEventListeners = 0;
+            m_pContentEventListeners, m_pContentEventListeners = nullptr;
 
         pPropertySetInfoChangeListeners =
             m_pPropertySetInfoChangeListeners,
-            m_pPropertySetInfoChangeListeners = 0;
+            m_pPropertySetInfoChangeListeners = nullptr;
 
         pPropertyListener =
-            m_pPropertyListener, m_pPropertyListener = 0;
+            m_pPropertyListener, m_pPropertyListener = nullptr;
     }
 
     if ( pDisposeEventListeners && pDisposeEventListeners->getLength() )
@@ -722,7 +722,7 @@ BaseContent::getParent(
 
     bool err = fileaccess::shell::getUrlFromUnq( ParentUnq, ParentUrl );
     if( err )
-        return Reference< XInterface >( 0 );
+        return Reference< XInterface >( nullptr );
 
     FileContentIdentifier* p = new FileContentIdentifier( ParentUnq );
     Reference< XContentIdentifier > Identifier( p );
@@ -969,7 +969,7 @@ BaseContent::open(
     sal_Int32 nMyCommandIdentifier,
     const OpenCommandArgument2& aCommandArgument )
 {
-    Reference< XDynamicResultSet > retValue( 0 );
+    Reference< XDynamicResultSet > retValue( nullptr );
 
     if( ( m_nState & Deleted ) )
     {
@@ -1268,7 +1268,7 @@ BaseContent::cDEL()
                                       m_xContentIdentifier,
                                       m_pContentEventListeners->getElements() );
     else
-        p = 0;
+        p = nullptr;
 
     return p;
 }
@@ -1284,7 +1284,7 @@ BaseContent::cEXC( const OUString& aNewName )
     FileContentIdentifier* pp = new FileContentIdentifier( aNewName );
     m_xContentIdentifier.set( pp );
 
-    ContentEventNotifier* p = 0;
+    ContentEventNotifier* p = nullptr;
     if( m_pContentEventListeners )
         p = new ContentEventNotifier( m_pMyShell,
                                       this,
@@ -1300,7 +1300,7 @@ ContentEventNotifier*
 BaseContent::cCEL()
 {
     osl::MutexGuard aGuard( m_aMutex );
-    ContentEventNotifier* p = 0;
+    ContentEventNotifier* p = nullptr;
     if( m_pContentEventListeners )
         p = new ContentEventNotifier( m_pMyShell,
                                       this,
@@ -1314,7 +1314,7 @@ PropertySetInfoChangeNotifier*
 BaseContent::cPSL()
 {
     osl::MutexGuard aGuard( m_aMutex );
-    PropertySetInfoChangeNotifier* p = 0;
+    PropertySetInfoChangeNotifier* p = nullptr;
     if( m_pPropertySetInfoChangeListeners  )
         p = new PropertySetInfoChangeNotifier( this,
                                                m_xContentIdentifier,
@@ -1331,11 +1331,11 @@ BaseContent::cPCL()
     osl::MutexGuard aGuard( m_aMutex );
 
     if (!m_pPropertyListener)
-        return NULL;
+        return nullptr;
 
     Sequence< OUString > seqNames = m_pPropertyListener->getContainedTypes();
 
-    PropertyChangeNotifier* p = 0;
+    PropertyChangeNotifier* p = nullptr;
 
     sal_Int32 length = seqNames.getLength();
 
diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index f2d45bb55292..2652a95a8641 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -93,7 +93,7 @@ FileContentIdentifier::getTypes(
     void )
     throw( uno::RuntimeException, std::exception )
 {
-    static cppu::OTypeCollection* pCollection = NULL;
+    static cppu::OTypeCollection* pCollection = nullptr;
     if ( !pCollection ) {
         osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
         if ( !pCollection )
diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index ad497f6997d8..978263290d98 100644
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
@@ -80,7 +80,7 @@ XRow_impl::XRow_impl( shell* pMyShell,const uno::Sequence< uno::Any >& seq )
       m_nWasNull(false),
       m_pMyShell( pMyShell ),
       m_xProvider( pMyShell->m_pProvider ),
-      m_xTypeConverter( 0 )
+      m_xTypeConverter( nullptr )
 {
 }
 
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index 60bbfbb7a8b4..3f973de9143b 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -56,9 +56,9 @@ XResultSet_impl::XResultSet_impl( shell* pMyShell,
     , m_aFolder( aUnqPath )
     , m_sProperty( seq )
     , m_sSortingInfo( seqSort )
-    , m_pDisposeEventListeners( 0 )
-    , m_pRowCountListeners( 0 )
-    , m_pIsFinalListeners( 0 )
+    , m_pDisposeEventListeners( nullptr )
+    , m_pRowCountListeners( nullptr )
+    , m_pIsFinalListeners( nullptr )
     , m_bStatic( false )
     , m_nErrorCode( TASKHANDLER_NO_ERROR )
     , m_nMinorErrorCode( TASKHANDLER_NO_ERROR )
@@ -671,7 +671,7 @@ XResultSet_impl::connectToCache(
         if( xStubFactory.is() )
         {
             xStubFactory->connectToCache(
-                this, xCache,m_sSortingInfo, NULL );
+                this, xCache,m_sSortingInfo, nullptr );
             return;
         }
     }
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index e018d67787e3..daa5de3ae6b9 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -63,27 +63,27 @@ class XResultSet_impl : public Notifier,
 
         virtual ContentEventNotifier*        cDEL() override
         {
-            return 0;
+            return nullptr;
         }
 
         virtual ContentEventNotifier*        cEXC( const OUString& ) override
         {
-            return 0;
+            return nullptr;
         }
 
         virtual ContentEventNotifier*          cCEL() override
         {
-            return 0;
+            return nullptr;
         }
 
         virtual PropertySetInfoChangeNotifier* cPSL() override
         {
-            return 0;
+            return nullptr;
         }
 
         virtual PropertyChangeNotifier*        cPCL() override
         {
-            return 0;
+            return nullptr;
         }
 
         sal_Int32 SAL_CALL CtorSuccess() { return m_nErrorCode;}
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index 44e6870b3216..a515f549a664 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -63,13 +63,13 @@ namespace fileaccess
 
             explicit TaskHandling(
                 const css::uno::Reference< css::ucb::XCommandEnvironment >&  xCommandEnv
-                = css::uno::Reference< css::ucb::XCommandEnvironment >( 0 ) )
+                = css::uno::Reference< css::ucb::XCommandEnvironment >( nullptr ) )
                 : m_bAbort( false ),
                   m_bHandled( false ),
                   m_nErrorCode( TASKHANDLER_NO_ERROR ),
                   m_nMinorCode( TASKHANDLER_NO_ERROR ),
-                  m_xInteractionHandler( 0 ),
-                  m_xProgressHandler( 0 ),
+                  m_xInteractionHandler( nullptr ),
+                  m_xProgressHandler( nullptr ),
                   m_xCommandEnvironment( xCommandEnv )
             {
             }
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 82cfca68f3b0..96db2c759a31 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -50,7 +50,7 @@ using namespace com::sun::star::container;
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
-    void * pRet = 0;
+    void * pRet = nullptr;
 
     Reference< XMultiServiceFactory > xSMgr(
             static_cast< XMultiServiceFactory * >( pServiceManager ) );
@@ -87,7 +87,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory(
 FileProvider::FileProvider( const Reference< XComponentContext >& rxContext )
     : m_xContext(rxContext)
     , m_FileSystemNotation(FileSystemNotation::UNKNOWN_NOTATION)
-    , m_pMyShell(NULL)
+    , m_pMyShell(nullptr)
 {
 }
 
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 2d3cea0631d7..cb27c763df17 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -70,11 +70,11 @@ using namespace com::sun::star::ucb;
 #endif
 
 shell::UnqPathData::UnqPathData()
-    : properties( 0 ),
-      notifier( 0 ),
-      xS( 0 ),
-      xC( 0 ),
-      xA( 0 )
+    : properties( nullptr ),
+      notifier( nullptr ),
+      xS( nullptr ),
+      xC( nullptr ),
+      xA( nullptr )
 {
     // empty
 }
@@ -97,11 +97,11 @@ shell::UnqPathData& shell::UnqPathData::operator=( UnqPathData& a )
     xS = a.xS;
     xC = a.xC;
     xA = a.xA;
-    a.properties = 0;
-    a.notifier = 0;
-    a.xS = 0;
-    a.xC = 0;
-    a.xA = 0;
+    a.properties = nullptr;
+    a.notifier = nullptr;
+    a.xS = nullptr;
+    a.xC = nullptr;
+    a.xA = nullptr;
     return *this;
 }
 
@@ -543,9 +543,9 @@ shell::deassociate( const OUString& aUnqPath,
 
         if( properties.find( ContentTProperty )->getState() == beans::PropertyState_DEFAULT_VALUE )
         {
-            it->second.xS = 0;
-            it->second.xC = 0;
-            it->second.xA = 0;
+            it->second.xS = nullptr;
+            it->second.xC = nullptr;
+            it->second.xA = nullptr;
             if(m_xFileRegistry.is())
                 m_xFileRegistry->removePropertySet( aUnqPath );
         }
@@ -672,7 +672,7 @@ shell::open( sal_Int32 CommandId,
                       xInputStream->getMinorError() );
 
         delete xInputStream;
-        xInputStream = 0;
+        xInputStream = nullptr;
     }
 
     return uno::Reference< io::XInputStream >( xInputStream );
@@ -708,7 +708,7 @@ shell::open_rw( sal_Int32 CommandId,
                       xStream->getMinorError() );
 
         delete xStream;
-        xStream = 0;
+        xStream = nullptr;
     }
     return uno::Reference< io::XStream >( xStream );
 }
@@ -744,7 +744,7 @@ shell::ls( sal_Int32 CommandId,
                       p->getMinorError() );
 
         delete p;
-        p = 0;
+        p = nullptr;
     }
 
     return uno::Reference< XDynamicResultSet > ( p );
@@ -893,7 +893,7 @@ shell::setv( const OUString& aUnqPath,
                         IOErrorCode ioError(IOErrorCode_GENERAL);
                         ret[i] <<= InteractiveAugmentedIOException(
                             OUString(),
-                            0,
+                            nullptr,
                             task::InteractionClassification_ERROR,
                             ioError,
                             names );
@@ -1001,7 +1001,7 @@ shell::setv( const OUString& aUnqPath,
                         }
                         ret[i] <<= InteractiveAugmentedIOException(
                             OUString(),
-                            0,
+                            nullptr,
                             task::InteractionClassification_ERROR,
                             ioError,
                             names );
@@ -1290,7 +1290,7 @@ bool getType(
     TaskManager & task, sal_Int32 id, OUString const & fileUrl,
     osl::DirectoryItem * item, osl::FileStatus::Type * type)
 {
-    OSL_ASSERT(item != 0 && type != 0);
+    OSL_ASSERT(item != nullptr && type != nullptr);
     osl::FileBase::RC err = osl::DirectoryItem::get(fileUrl, *item);
     if (err != osl::FileBase::E_None) {
         task.installError(id, TASKHANDLING_TRANSFER_BY_COPY_SOURCE, err);
@@ -2243,7 +2243,7 @@ shell::commit( const shell::ContentMap::iterator& it,
     uno::Any aAny;
     shell::PropertySet::iterator it1;
 
-    if( it->second.properties == 0 )
+    if( it->second.properties == nullptr )
     {
         OUString aPath = it->first;
         insertDefaultProperties( aPath );
@@ -2755,12 +2755,12 @@ shell::getContentExchangedEventListeners( const OUString& aOldPrefix,
                 // copy Ownership also
                 delete itnew->second.properties;
                 itnew->second.properties = itold->second.properties;
-                itold->second.properties = 0;
+                itold->second.properties = nullptr;
 
                 // copy existing list
                 std::list< Notifier* >* copyList = itnew->second.notifier;
                 itnew->second.notifier = itold->second.notifier;
-                itold->second.notifier = 0;
+                itold->second.notifier = nullptr;
 
                 m_aContent.erase( itold );
 
@@ -2780,7 +2780,7 @@ shell::getContentExchangedEventListeners( const OUString& aOldPrefix,
 
                 // Merge with preexisting notifiers
                 // However, these may be in status BaseContent::Deleted
-                if( copyList != 0 )
+                if( copyList != nullptr )
                 {
                     std::list< Notifier* >::iterator copyIt = copyList->begin();
                     while( copyIt != copyList->end() )
@@ -2906,12 +2906,12 @@ shell::erasePersistentSet( const OUString& aUnqPath,
             ContentMap::iterator it = m_aContent.find( old_Name );
             if( it != m_aContent.end() )
             {
-                it->second.xS = 0;
-                it->second.xC = 0;
-                it->second.xA = 0;
+                it->second.xS = nullptr;
+                it->second.xC = nullptr;
+                it->second.xA = nullptr;
 
                 delete it->second.properties;
-                it->second.properties = 0;
+                it->second.properties = nullptr;
             }
         }
 
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index b71ac1730a22..37468de43e22 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -152,7 +152,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes()
     throw( css::uno::RuntimeException,
            std::exception )
 {
-    static cppu::OTypeCollection* pCollection = NULL;
+    static cppu::OTypeCollection* pCollection = nullptr;
     if ( !pCollection )
     {
         osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
@@ -373,7 +373,7 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand,
             case THROWAUTHENTICATIONREQUEST:
                 ucbhelper::cancelCommandExecution(
                     aRet,
-                    Reference<XCommandEnvironment>(0));
+                    Reference<XCommandEnvironment>(nullptr));
                 break;
 
             case THROWACCESSDENIED:
@@ -683,7 +683,7 @@ FTPContent::createNewContent( const ContentInfo& Info )
                               m_pFCP,
                               m_xIdentifier,Info);
     else
-        return Reference<XContent>(0);
+        return Reference<XContent>(nullptr);
 }
 
 
@@ -918,7 +918,7 @@ Sequence<Any> FTPContent::setPropertyValues(
                 }
         } else {
             Sequence<Property> props =
-                getProperties(Reference<XCommandEnvironment>(0));
+                getProperties(Reference<XCommandEnvironment>(nullptr));
 
             // either unknown or read-only
             ret[i] <<= UnknownPropertyException();
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index cab4ccc35f9a..9b9827a2f6a3 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -85,7 +85,7 @@ FTPContentIdentifier::getTypes(
     void )
     throw(RuntimeException, std::exception)
 {
-    static cppu::OTypeCollection* pCollection = NULL;
+    static cppu::OTypeCollection* pCollection = nullptr;
     if ( !pCollection ) {
         osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
         if ( !pCollection )
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 98e7ea5d1d46..f85f0a335db6 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -42,8 +42,8 @@ using namespace com::sun::star::beans;
 
 FTPContentProvider::FTPContentProvider( const Reference< XComponentContext >& rxContext)
     : ::ucbhelper::ContentProviderImplHelper(rxContext)
-    , m_ftpLoaderThread(0)
-    , m_pProxyDecider(0)
+    , m_ftpLoaderThread(nullptr)
+    , m_pProxyDecider(nullptr)
 {
 }
 
@@ -91,7 +91,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContentProvider::getTypes()
     throw( css::uno::RuntimeException,
            std::exception )
 {
-    static cppu::OTypeCollection* pCollection = NULL;
+    static cppu::OTypeCollection* pCollection = nullptr;
     if ( !pCollection )
     {
         osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx
index d5d7d93e48be..08e10a14fab0 100644
--- a/ucb/source/ucp/ftp/ftpdirp.cxx
+++ b/ucb/source/ucp/ftp/ftpdirp.cxx
@@ -882,8 +882,8 @@ bool FTPDirectoryParser::parseUNIX (
         FOUND_NONE, FOUND_SIZE, FOUND_MONTH, FOUND_DAY, FOUND_YEAR_TIME
     };
 
-    const sal_Char *pDayStart = 0;
-    const sal_Char *pDayEnd = 0;
+    const sal_Char *pDayStart = nullptr;
+    const sal_Char *pDayEnd = nullptr;
     Mode eMode;
     for (eMode = FOUND_NONE; *p1 && eMode != FOUND_YEAR_TIME; p1 = p2 + 1)
     {
diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
index e910f0e4083b..888219c1929e 100644
--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
@@ -82,12 +82,12 @@ CURL* FTPLoaderThread::handle() {
     CURL* ret = osl_getThreadKeyData(m_threadKey);
     if(!ret) {
         ret = curl_easy_init();
-        if (ret != 0) {
+        if (ret != nullptr) {
             // Make sure curl is not internally using environment variables like
             // "ftp_proxy":
             if (curl_easy_setopt(ret, CURLOPT_PROXY, "") != CURLE_OK) {
                 curl_easy_cleanup(ret);
-                ret = 0;
+                ret = nullptr;
             }
         }
         osl_setThreadKeyData(m_threadKey,static_cast<void*>(ret));
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index c92769d3592a..0b774fb12e0f 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -44,9 +44,9 @@ ResultSetBase::ResultSetBase(
       m_bRowCountFinal( true ),
       m_sProperty( seq ),
       m_sSortingInfo( seqSort ),
-      m_pDisposeEventListeners( 0 ),
-      m_pRowCountListeners( 0 ),
-      m_pIsFinalListeners( 0 )
+      m_pDisposeEventListeners( nullptr ),
+      m_pRowCountListeners( nullptr ),
+      m_pIsFinalListeners( nullptr )
 {
 }
 
@@ -366,7 +366,7 @@ ResultSetBase::getStatement(
     throw( sdbc::SQLException,
            uno::RuntimeException, std::exception )
 {
-    uno::Reference< uno::XInterface > test( 0 );
+    uno::Reference< uno::XInterface > test( nullptr );
     return test;
 }
 
diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx
index e70785afced7..511f3375de52 100644
--- a/ucb/source/ucp/ftp/ftpservices.cxx
+++ b/ucb/source/ucp/ftp/ftpservices.cxx
@@ -29,7 +29,7 @@ using namespace ftp;
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpftp1_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
-    void * pRet = 0;
+    void * pRet = nullptr;
 
     uno::Reference< lang::XMultiServiceFactory > xSMgr(
         static_cast< lang::XMultiServiceFactory * >(
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 8164ce31c2e8..f865d9aeeb2c 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -63,7 +63,7 @@ OUString decodePathSegment(OUString const & encoded) {
 MemoryContainer::MemoryContainer()
     : m_nLen(0),
       m_nWritePos(0),
-      m_pBuffer(0)
+      m_pBuffer(nullptr)
 {
 }
 
@@ -398,8 +398,8 @@ oslFileHandle FTPURL::open()
     OUString url(ident(false,true));
     SET_URL(url);
 
-    oslFileHandle res( NULL );
-    if ( osl_createTempFile( NULL, &res, NULL ) == osl_File_E_None )
+    oslFileHandle res( nullptr );
+    if ( osl_createTempFile( nullptr, &res, nullptr ) == osl_File_E_None )
     {
         curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,file_write);
         curl_easy_setopt(curl,CURLOPT_WRITEDATA,res);
@@ -414,7 +414,7 @@ oslFileHandle FTPURL::open()
                     "osl_setFilePos failed");
         }
         else {
-            osl_closeFile(res),res = 0;
+            osl_closeFile(res),res = nullptr;
             throw curl_exception(err);
         }
     }
@@ -519,7 +519,7 @@ OUString FTPURL::net_title() const
 
     SET_CONTROL_CONTAINER;
     curl_easy_setopt(curl,CURLOPT_NOBODY,true);       // no data => no transfer
-    struct curl_slist *slist = 0;
+    struct curl_slist *slist = nullptr;
     // post request
     slist = curl_slist_append(slist,"PWD");
     curl_easy_setopt(curl,CURLOPT_POSTQUOTE,slist);
@@ -689,7 +689,7 @@ void FTPURL::mkdir(bool ReplaceExisting) const
     OString aDel("del "); aDel += title;
     OString mkd("mkd "); mkd += title;
 
-    struct curl_slist *slist = 0;
+    struct curl_slist *slist = nullptr;
 
     FTPDirentry aDirentry(direntry());
     if(!ReplaceExisting) {
@@ -740,7 +740,7 @@ OUString FTPURL::ren(const OUString& NewTitle)
                      NewTitle.getLength(),
                      RTL_TEXTENCODING_UTF8);
 
-    struct curl_slist *slist = 0;
+    struct curl_slist *slist = nullptr;
     slist = curl_slist_append(slist,renamefrom.getStr());
     slist = curl_slist_append(slist,renameto.getStr());
     curl_easy_setopt(curl,CURLOPT_POSTQUOTE,slist);
@@ -791,7 +791,7 @@ void FTPURL::del() const
 
     // post request
     CURL *curl = m_pFCP->handle();
-    struct curl_slist *slist = 0;
+    struct curl_slist *slist = nullptr;
     slist = curl_slist_append(slist,dele.getStr());
     curl_easy_setopt(curl,CURLOPT_POSTQUOTE,slist);
 
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index 1a18ed683429..7a1271442c2a 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -84,7 +84,7 @@ namespace ftp {
 
         FTPURL(
             const OUString& aIdent,
-            FTPContentProvider* pFCP = 0
+            FTPContentProvider* pFCP = nullptr
         )
             throw(
                 malformed_exception
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 41a5a89cf5f1..b02e33ef5923 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -87,7 +87,7 @@ Content::Content(
     const uno::Reference< ucb::XContentIdentifier >& Identifier)
         throw ( ucb::ContentCreationException )
     : ContentImplHelper( rxContext, pProvider, Identifier ),
-      m_pProvider( pProvider ), mpFile (NULL), mpInfo( NULL ), mbTransient(false)
+      m_pProvider( pProvider ), mpFile (nullptr), mpInfo( nullptr ), mbTransient(false)
 {
     SAL_INFO("ucb.ucp.gio", "New Content ('" << m_xIdentifier->getContentIdentifier() << "')\n");
 }
@@ -99,7 +99,7 @@ Content::Content(
     bool bIsFolder)
         throw ( ucb::ContentCreationException )
     : ContentImplHelper( rxContext, pProvider, Identifier ),
-      m_pProvider( pProvider ), mpFile (NULL), mpInfo( NULL ), mbTransient(true)
+      m_pProvider( pProvider ), mpFile (nullptr), mpInfo( nullptr ), mbTransient(true)
 {
     SAL_INFO("ucb.ucp.gio", "Create Content ('" << m_xIdentifier->getContentIdentifier() << "')\n");
     mpInfo = g_file_info_new();
@@ -331,9 +331,9 @@ public:
     GError *Mount(GFile *pFile);
 };
 
-MountOperation::MountOperation(const uno::Reference< ucb::XCommandEnvironment >& xEnv) : mpError(NULL)
+MountOperation::MountOperation(const uno::Reference< ucb::XCommandEnvironment >& xEnv) : mpError(nullptr)
 {
-    mpLoop = g_main_loop_new(NULL, FALSE);
+    mpLoop = g_main_loop_new(nullptr, FALSE);
     mpAuthentication = ooo_mount_operation_new(xEnv);
 }
 
@@ -346,7 +346,7 @@ void MountOperation::Completed(GObject *source, GAsyncResult *res, gpointer user
 
 GError *MountOperation::Mount(GFile *pFile)
 {
-    g_file_mount_enclosing_volume(pFile, G_MOUNT_MOUNT_NONE, mpAuthentication, NULL, MountOperation::Completed, this);
+    g_file_mount_enclosing_volume(pFile, G_MOUNT_MOUNT_NONE, mpAuthentication, nullptr, MountOperation::Completed, this);
     {
         //HACK: At least the gdk_threads_set_lock_functions(GdkThreadsEnter,
         // GdkThreadsLeave) call in vcl/unx/gtk/app/gtkinst.cxx will lead to
@@ -367,15 +367,15 @@ MountOperation::~MountOperation()
 
 GFileInfo* Content::getGFileInfo(const uno::Reference< ucb::XCommandEnvironment >& xEnv, GError **ppError)
 {
-    GError * err = 0;
-    if (mpInfo == 0 && !mbTransient) {
+    GError * err = nullptr;
+    if (mpInfo == nullptr && !mbTransient) {
         for (bool retried = false;; retried = true) {
             mpInfo = g_file_query_info(
-                getGFile(), "*", G_FILE_QUERY_INFO_NONE, 0, &err);
-            if (mpInfo != 0) {
+                getGFile(), "*", G_FILE_QUERY_INFO_NONE, nullptr, &err);
+            if (mpInfo != nullptr) {
                 break;
             }
-            assert(err != 0);
+            assert(err != nullptr);
             if (err->code != G_IO_ERROR_NOT_MOUNTED || retried) {
                 break;
             }
@@ -385,14 +385,14 @@ GFileInfo* Content::getGFileInfo(const uno::Reference< ucb::XCommandEnvironment
                     << "\", trying to mount");
             g_error_free(err);
             err = MountOperation(xEnv).Mount(getGFile());
-            if (err != 0) {
+            if (err != nullptr) {
                 break;
             }
         }
     }
-    if (ppError != 0) {
+    if (ppError != nullptr) {
         *ppError = err;
-    } else if (err != 0) {
+    } else if (err != nullptr) {
         SAL_WARN(
             "ucb.ucp.gio",
             "ignoring GError \"" << err->message << "\" for <"
@@ -448,7 +448,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo *
 
         if ( rProp.Name == "IsDocument" )
         {
-            if (pInfo != 0 && g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_TYPE))
+            if (pInfo != nullptr && g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_TYPE))
                 xRow->appendBoolean( rProp, ( g_file_info_get_file_type( pInfo ) == G_FILE_TYPE_REGULAR ||
                                                g_file_info_get_file_type( pInfo ) == G_FILE_TYPE_UNKNOWN ) );
             else
@@ -456,14 +456,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo *
         }
         else if ( rProp.Name == "IsFolder" )
         {
-            if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_TYPE) )
+            if (pInfo != nullptr && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_TYPE) )
                 xRow->appendBoolean( rProp, ( g_file_info_get_file_type( pInfo ) == G_FILE_TYPE_DIRECTORY ));
             else
                 xRow->appendVoid( rProp );
         }
         else if ( rProp.Name == "Title" )
         {
-            if (pInfo != 0 && g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME))
+            if (pInfo != nullptr && g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME))
             {
                 const char *pName = g_file_info_get_display_name(pInfo);
                 xRow->appendString( rProp, OUString(pName, strlen(pName), RTL_TEXTENCODING_UTF8) );
@@ -473,28 +473,28 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo *
         }
         else if ( rProp.Name == "IsReadOnly" )
         {
-            if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE ) )
+            if (pInfo != nullptr && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE ) )
                 xRow->appendBoolean( rProp, !g_file_info_get_attribute_boolean( pInfo, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE) );
             else
                 xRow->appendVoid( rProp );
         }
         else if ( rProp.Name == "DateCreated" )
         {
-            if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_TIME_CREATED ) )
+            if (pInfo != nullptr && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_TIME_CREATED ) )
                 xRow->appendTimestamp( rProp, getDateFromUnix(g_file_info_get_attribute_uint64(pInfo, G_FILE_ATTRIBUTE_TIME_CREATED)) );
             else
                 xRow->appendVoid( rProp );
         }
         else if ( rProp.Name == "DateModified" )
         {
-            if (pInfo != 0 && g_file_info_has_attribute( pInfo,  G_FILE_ATTRIBUTE_TIME_CHANGED ) )
+            if (pInfo != nullptr && g_file_info_has_attribute( pInfo,  G_FILE_ATTRIBUTE_TIME_CHANGED ) )
                 xRow->appendTimestamp( rProp, getDateFromUnix(g_file_info_get_attribute_uint64(pInfo, G_FILE_ATTRIBUTE_TIME_CHANGED)) );
             else
                 xRow->appendVoid( rProp );
         }
         else if ( rProp.Name == "Size" )
         {
-            if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_SIZE) )
+            if (pInfo != nullptr && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_SIZE) )
                 xRow->appendLong( rProp, ( g_file_info_get_size( pInfo ) ));
             else
                 xRow->appendVoid( rProp );
@@ -506,14 +506,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo *
         }
         else if ( rProp.Name == "IsCompactDisc" )
         {
-            if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT ) )
+            if (pInfo != nullptr && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT ) )
                 xRow->appendBoolean( rProp, g_file_info_get_attribute_boolean(pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT) );
             else
                 xRow->appendVoid( rProp );
         }
         else if ( rProp.Name == "IsRemoveable" )
         {
-            if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT ) )
+            if (pInfo != nullptr && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT ) )
                 xRow->appendBoolean( rProp, g_file_info_get_attribute_boolean(pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT ) );
             else
                 xRow->appendVoid( rProp );
@@ -524,7 +524,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo *
         }
         else if ( rProp.Name == "IsHidden" )
         {
-            if (pInfo != 0 && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) )
+            if (pInfo != nullptr && g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) )
                 xRow->appendBoolean( rProp, ( g_file_info_get_is_hidden ( pInfo ) ) );
             else
                 xRow->appendVoid( rProp );
@@ -652,8 +652,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
     const uno::Sequence< beans::PropertyValue >& rValues,
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
 {
-    GError *pError=NULL;
-    GFileInfo *pNewInfo=NULL;
+    GError *pError=nullptr;
+    GFileInfo *pNewInfo=nullptr;
     GFileInfo *pInfo = getGFileInfo(xEnv, &pError);
     if (pInfo)
         pNewInfo = g_file_info_dup(pInfo);
@@ -677,7 +677,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
     aEvent.PropertyHandle = -1;
 
     sal_Int32 nChanged = 0, nTitlePos = -1;
-    const char *newName = NULL;
+    const char *newName = nullptr;
     uno::Sequence< beans::PropertyChangeEvent > aChanges(nCount);
 
     uno::Sequence< uno::Any > aRet( nCount );
@@ -777,7 +777,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             if (!mbTransient) //Discard and refetch
             {
                 g_object_unref(mpInfo);
-                mpInfo = NULL;
+                mpInfo = nullptr;
             }
 
             if (mpInfo)
@@ -791,7 +791,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             if (mpFile) //Discard and refetch
             {
                 g_object_unref(mpFile);
-                mpFile = NULL;
+                mpFile = nullptr;
             }
         }
 
@@ -808,7 +808,7 @@ bool Content::doSetFileInfo(GFileInfo *pNewInfo)
 
     bool bOk = true;
     GFile *pFile = getGFile();
-    if(!g_file_set_attributes_from_info(pFile, pNewInfo, G_FILE_QUERY_INFO_NONE, NULL, NULL))
+    if(!g_file_set_attributes_from_info(pFile, pNewInfo, G_FILE_QUERY_INFO_NONE, nullptr, nullptr))
         bOk = false;
     return bOk;
 }
@@ -840,8 +840,8 @@ bool Content::feedSink( uno::Reference< uno::XInterface > xSink,
     if ( !xOut.is() && !xDataSink.is() )
         return false;
 
-    GError *pError=NULL;
-    GFileInputStream *pStream = g_file_read(getGFile(), NULL, &pError);
+    GError *pError=nullptr;
+    GFileInputStream *pStream = g_file_read(getGFile(), nullptr, &pError);
     if (!pStream)
        convertToException(pError, static_cast< cppu::OWeakObject * >(this));
 
@@ -864,7 +864,7 @@ uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand,
 {
     bool bIsFolder = isFolder(xEnv);
 
-    if (!g_file_query_exists(getGFile(), NULL))
+    if (!g_file_query_exists(getGFile(), nullptr))
     {
         uno::Sequence< uno::Any > aArgs( 1 );
         aArgs[ 0 ] <<= m_xIdentifier->getContentIdentifier();
@@ -992,13 +992,13 @@ uno::Any SAL_CALL Content::execute(
 
         //If no delete physical, try and trashcan it, if that doesn't work go
         //ahead and try and delete it anyway
-        if (!bDeletePhysical && !g_file_trash(getGFile(), NULL, NULL))
+        if (!bDeletePhysical && !g_file_trash(getGFile(), nullptr, nullptr))
                 bDeletePhysical = true;
 
         if (bDeletePhysical)
         {
-            GError *pError = NULL;
-            if (!g_file_delete( getGFile(), NULL, &pError))
+            GError *pError = nullptr;
+            if (!g_file_delete( getGFile(), nullptr, &pError))
                 ucbhelper::cancelCommandExecution(mapGIOError(pError), xEnv);
         }
 
@@ -1042,7 +1042,7 @@ void Content::insert(const uno::Reference< io::XInputStream > &xInputStream,
     bool bReplaceExisting, const uno::Reference< ucb::XCommandEnvironment > &xEnv )
         throw( uno::Exception )
 {
-    GError *pError = NULL;
+    GError *pError = nullptr;
     GFileInfo *pInfo = getGFileInfo(xEnv);
 
     if ( pInfo &&
@@ -1052,7 +1052,7 @@ void Content::insert(const uno::Reference< io::XInputStream > &xInputStream,
 #if OSL_DEBUG_LEVEL > 1
         g_warning ("Make directory");
 #endif
-        if( !g_file_make_directory( getGFile(), NULL, &pError))
+        if( !g_file_make_directory( getGFile(), nullptr, &pError))
             ucbhelper::cancelCommandExecution(mapGIOError(pError), xEnv);
         return;
     }
@@ -1065,15 +1065,15 @@ void Content::insert(const uno::Reference< io::XInputStream > &xInputStream,
             xEnv );
     }
 
-    GFileOutputStream* pOutStream = NULL;
+    GFileOutputStream* pOutStream = nullptr;
     if ( bReplaceExisting )
     {
-        if (!(pOutStream = g_file_replace(getGFile(), NULL, false, G_FILE_CREATE_PRIVATE, NULL, &pError)))
+        if (!(pOutStream = g_file_replace(getGFile(), nullptr, false, G_FILE_CREATE_PRIVATE, nullptr, &pError)))
             ucbhelper::cancelCommandExecution(mapGIOError(pError), xEnv);
     }
     else
     {
-        if (!(pOutStream = g_file_create (getGFile(), G_FILE_CREATE_PRIVATE, NULL, &pError)))
+        if (!(pOutStream = g_file_create (getGFile(), G_FILE_CREATE_PRIVATE, nullptr, &pError)))
             ucbhelper::cancelCommandExecution(mapGIOError(pError), xEnv);
     }
 
@@ -1106,11 +1106,11 @@ void Content::transfer( const ucb::TransferInfo& aTransferInfo, const uno::Refer
     GFile *pSource = g_file_new_for_uri(OUStringToOString(aTransferInfo.SourceURL, RTL_TEXTENCODING_UTF8).getStr());
 
     gboolean bSuccess = false;
-    GError *pError = NULL;
+    GError *pError = nullptr;
     if (aTransferInfo.MoveData)
-        bSuccess = g_file_move(pSource, pDest, G_FILE_COPY_OVERWRITE, NULL, NULL, 0, &pError);
+        bSuccess = g_file_move(pSource, pDest, G_FILE_COPY_OVERWRITE, nullptr, nullptr, nullptr, &pError);
     else
-        bSuccess = g_file_copy(pSource, pDest, DEFAULT_COPYDATA_FLAGS, NULL, NULL, 0, &pError);
+        bSuccess = g_file_copy(pSource, pDest, DEFAULT_COPYDATA_FLAGS, nullptr, nullptr, nullptr, &pError);
     g_object_unref(pSource);
     g_object_unref(pDest);
     if (!bSuccess)
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index eb2094984806..6bb53cb6abb4 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -69,7 +69,7 @@ private:
     bool mbTransient;
 
     GFileInfo *getGFileInfo(const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv,
-        GError **ppError=NULL);
+        GError **ppError=nullptr);
     bool isFolder(const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv);
 
     css::uno::Any mapGIOError( GError *error );
diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx
index cabe44409bce..cc647a4ead19 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.cxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.cxx
@@ -51,13 +51,13 @@ bool DataSupplier::getData()
     GFile *pFile = mxContent->getGFile();
 
     GFileEnumerator* pEnumerator = g_file_enumerate_children(pFile, "*",
-        G_FILE_QUERY_INFO_NONE, NULL, NULL);
+        G_FILE_QUERY_INFO_NONE, nullptr, nullptr);
 
     if (!pEnumerator)
         return false;
 
-    GFileInfo *pInfo = NULL;
-    while ((pInfo = g_file_enumerator_next_file (pEnumerator, NULL, NULL)))
+    GFileInfo *pInfo = nullptr;
+    while ((pInfo = g_file_enumerator_next_file (pEnumerator, nullptr, nullptr)))
     {
         switch ( mnOpenMode )
         {
@@ -80,7 +80,7 @@ bool DataSupplier::getData()
 
     mbCountFinal = true;
 
-    g_file_enumerator_close(pEnumerator, NULL, NULL);
+    g_file_enumerator_close(pEnumerator, nullptr, nullptr);
     return true;
 }
 
@@ -116,7 +116,7 @@ OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
         g_free(parent);
 
         char *escaped_name =
-            g_uri_escape_string( g_file_info_get_name(maResults[ nIndex ]->pInfo) , NULL, false);
+            g_uri_escape_string( g_file_info_get_name(maResults[ nIndex ]->pInfo) , nullptr, false);
 
         if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() )
                 aId += "/";
diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx
index e2c19e195b27..8c9453122514 100644
--- a/ucb/source/ucp/gio/gio_inputstream.cxx
+++ b/ucb/source/ucp/gio/gio_inputstream.cxx
@@ -50,7 +50,7 @@ void SAL_CALL InputStream::closeInput()
     throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception )
 {
     if (mpStream)
-        g_input_stream_close(G_INPUT_STREAM(mpStream), NULL, NULL);
+        g_input_stream_close(G_INPUT_STREAM(mpStream), nullptr, nullptr);
 }
 
 void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip )
@@ -81,8 +81,8 @@ sal_Int32 SAL_CALL InputStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal
     }
 
     gsize nBytesRead = 0;
-    GError *pError=NULL;
-    if (!g_input_stream_read_all(G_INPUT_STREAM(mpStream), aData.getArray(), nBytesToRead, &nBytesRead, NULL, &pError))
+    GError *pError=nullptr;
+    if (!g_input_stream_read_all(G_INPUT_STREAM(mpStream), aData.getArray(), nBytesToRead, &nBytesRead, nullptr, &pError))
         convertToIOException(pError, static_cast< cppu::OWeakObject * >(this));
     aData.realloc(nBytesRead);
     return nBytesRead;
diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx
index ff3c75fe910b..b9e898719d34 100644
--- a/ucb/source/ucp/gio/gio_mount.cxx
+++ b/ucb/source/ucp/gio/gio_mount.cxx
@@ -36,8 +36,8 @@ static void ooo_mount_operation_ask_password (GMountOperation   *op,
 
 static void ooo_mount_operation_init (OOoMountOperation *op)
 {
-    op->m_pPrevPassword = NULL;
-    op->m_pPrevUsername = NULL;
+    op->m_pPrevPassword = nullptr;
+    op->m_pPrevUsername = nullptr;
 }
 
 static void ooo_mount_operation_finalize (GObject *object)
@@ -175,7 +175,7 @@ static void ooo_mount_operation_ask_password (GMountOperation *op,
 
 GMountOperation *ooo_mount_operation_new(const uno::Reference< ucb::XCommandEnvironment >& rEnv)
 {
-    OOoMountOperation *pRet = static_cast<OOoMountOperation*>(g_object_new (OOO_TYPE_MOUNT_OPERATION, NULL));
+    OOoMountOperation *pRet = static_cast<OOoMountOperation*>(g_object_new (OOO_TYPE_MOUNT_OPERATION, nullptr));
     pRet->pEnv = &rEnv;
     return &pRet->parent_instance;
 }
diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx
index 743d04b8a23b..4698ab93800c 100644
--- a/ucb/source/ucp/gio/gio_outputstream.cxx
+++ b/ucb/source/ucp/gio/gio_outputstream.cxx
@@ -47,8 +47,8 @@ void SAL_CALL OutputStream::writeBytes( const css::uno::Sequence< sal_Int8 >& rD
     if (!mpStream)
         throw io::NotConnectedException();
 
-    GError *pError=NULL;
-    if (!g_output_stream_write_all(G_OUTPUT_STREAM(mpStream), rData.getConstArray(), rData.getLength(), NULL, NULL, &pError))
+    GError *pError=nullptr;
+    if (!g_output_stream_write_all(G_OUTPUT_STREAM(mpStream), rData.getConstArray(), rData.getLength(), nullptr, nullptr, &pError))
         convertToIOException(pError, static_cast< cppu::OWeakObject * >(this));
 }
 
@@ -59,8 +59,8 @@ void SAL_CALL OutputStream::flush()
     if (!mpStream)
         throw io::NotConnectedException();
 
-    GError *pError=NULL;
-    if (!g_output_stream_flush(G_OUTPUT_STREAM(mpStream), NULL, &pError))
+    GError *pError=nullptr;
+    if (!g_output_stream_flush(G_OUTPUT_STREAM(mpStream), nullptr, &pError))
         convertToIOException(pError, static_cast< cppu::OWeakObject * >(this));
 }
 
@@ -69,7 +69,7 @@ void SAL_CALL OutputStream::closeOutput()
            uno::RuntimeException, std::exception )
 {
     if (mpStream)
-        g_output_stream_close(G_OUTPUT_STREAM(mpStream), NULL, NULL);
+        g_output_stream_close(G_OUTPUT_STREAM(mpStream), nullptr, nullptr);
 }
 
 uno::Any OutputStream::queryInterface( const uno::Type &type ) throw( uno::RuntimeException, std::exception )
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index 32745dec1c98..243b514891ab 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -106,7 +106,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgio1_component_getFactory( const sal_Char *pImplName,
     void *pServiceManager, void * )
 {
-    void * pRet = 0;
+    void * pRet = nullptr;
 
     uno::Reference< lang::XMultiServiceFactory > xSMgr
         (static_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx
index 9777fb5a7c6f..6566eff801f1 100644
--- a/ucb/source/ucp/gio/gio_seekable.cxx
+++ b/ucb/source/ucp/gio/gio_seekable.cxx
@@ -49,8 +49,8 @@ void SAL_CALL Seekable::truncate()
         throw io::IOException("Truncate unsupported",
             static_cast< cppu::OWeakObject * >(this));
 
-    GError *pError=NULL;
-    if (!g_seekable_truncate(mpStream, 0, NULL, &pError))
+    GError *pError=nullptr;
+    if (!g_seekable_truncate(mpStream, 0, nullptr, &pError))
         convertToIOException(pError, static_cast< cppu::OWeakObject * >(this));
 }
 
@@ -64,8 +64,8 @@ void SAL_CALL Seekable::seek( sal_Int64 location )
         throw io::IOException("Seek unsupported",
             static_cast< cppu::OWeakObject * >(this));
 
-    GError *pError=NULL;
-    if (!g_seekable_seek(mpStream, location, G_SEEK_SET, NULL, &pError))
+    GError *pError=nullptr;
+    if (!g_seekable_seek(mpStream, location, G_SEEK_SET, nullptr, &pError))
         convertToIOException(pError, static_cast< cppu::OWeakObject * >(this));
 }
 
@@ -86,8 +86,8 @@ sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeExc
     sal_uInt64 nSize = 0;
 
     GFileInfo* pInfo = G_IS_FILE_INPUT_STREAM(mpStream)
-        ? g_file_input_stream_query_info(G_FILE_INPUT_STREAM(mpStream), G_FILE_ATTRIBUTE_STANDARD_SIZE, NULL, NULL)
-        : g_file_output_stream_query_info(G_FILE_OUTPUT_STREAM(mpStream), G_FILE_ATTRIBUTE_STANDARD_SIZE, NULL, NULL);
+        ? g_file_input_stream_query_info(G_FILE_INPUT_STREAM(mpStream), G_FILE_ATTRIBUTE_STANDARD_SIZE, nullptr, nullptr)
+        : g_file_output_stream_query_info(G_FILE_OUTPUT_STREAM(mpStream), G_FILE_ATTRIBUTE_STANDARD_SIZE, nullptr, nullptr);
 
     if (pInfo)
     {
@@ -101,9 +101,9 @@ sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeExc
 
     if (!bOk)
     {
-        GError *pError=NULL;
+        GError *pError=nullptr;
         sal_Int64 nCurr = getPosition();
-        if (!g_seekable_seek(mpStream, 0, G_SEEK_END, NULL, &pError))
+        if (!g_seekable_seek(mpStream, 0, G_SEEK_END, nullptr, &pError))
             convertToIOException(pError, static_cast< cppu::OWeakObject * >(this));
         nSize = getPosition();
         seek(nCurr);
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 7fcb46c566f5..7978064596bf 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -90,7 +90,7 @@ HierarchyContent* HierarchyContent::create(
     // Fail, if content does not exist.
     HierarchyContentProperties aProps;
     if ( !loadData( rxContext, pProvider, Identifier, aProps ) )
-        return 0;
+        return nullptr;
 
     return new HierarchyContent( rxContext, pProvider, Identifier, aProps );
 }
@@ -104,10 +104,10 @@ HierarchyContent* HierarchyContent::create(
             const ucb::ContentInfo& Info )
 {
     if ( Info.Type.isEmpty() )
-        return 0;
+        return nullptr;
 
     if ( Info.Type != HIERARCHY_FOLDER_CONTENT_TYPE && Info.Type != HIERARCHY_LINK_CONTENT_TYPE )
-        return 0;
+        return nullptr;
 
     return new HierarchyContent( rxContext, pProvider, Identifier, Info );
 }
@@ -207,11 +207,11 @@ XTYPEPROVIDER_COMMON_IMPL( HierarchyContent );
 uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes()
     throw( uno::RuntimeException, std::exception )
 {
-    cppu::OTypeCollection * pCollection = 0;
+    cppu::OTypeCollection * pCollection = nullptr;
 
     if ( isFolder() && !isReadOnly() )
     {
-        static cppu::OTypeCollection* pFolderTypes = 0;
+        static cppu::OTypeCollection* pFolderTypes = nullptr;
 
         pCollection = pFolderTypes;
         if ( !pCollection )
@@ -244,7 +244,7 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes()
     }
     else
     {
-        static cppu::OTypeCollection* pDocumentTypes = 0;
+        static cppu::OTypeCollection* pDocumentTypes = nullptr;
 
         pCollection = pDocumentTypes;
         if ( !pCollection )
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index bd48fe9a6455..48b8d6ba3934 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -54,7 +54,7 @@ struct HierarchyEntry::iterator_Impl
     uno::Sequence< OUString>                          names;
     sal_Int32                                              pos;
     iterator_Impl()
-    : officeDirs( 0 ), pos( -1 /* before first */ ) {};
+    : officeDirs( nullptr ), pos( -1 /* before first */ ) {};
 };
 
 
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 41cfa3dc4b4a..398a044047a9 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -227,7 +227,7 @@ using namespace hcp_impl;
 HierarchyDataSource::HierarchyDataSource(
         const uno::Reference< uno::XComponentContext > & rxContext )
 : m_xContext( rxContext ),
-  m_pDisposeEventListeners( 0 )
+  m_pDisposeEventListeners( nullptr )
 {
 }
 
@@ -680,11 +680,11 @@ XTYPEPROVIDER_COMMON_IMPL( HierarchyDataAccess );
 uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes()
     throw( uno::RuntimeException, std::exception )
 {
-    cppu::OTypeCollection * pCollection = 0;
+    cppu::OTypeCollection * pCollection = nullptr;
 
     if ( m_bReadOnly )
     {
-        static cppu::OTypeCollection* pReadOnlyTypes = 0;
+        static cppu::OTypeCollection* pReadOnlyTypes = nullptr;
 
         pCollection = pReadOnlyTypes;
         if ( !pCollection )
@@ -712,7 +712,7 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes()
     }
     else
     {
-        static cppu::OTypeCollection* pReadWriteTypes = 0;
+        static cppu::OTypeCollection* pReadWriteTypes = nullptr;
 
         pCollection = pReadWriteTypes;
         if ( !pCollection )
diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
index fad56988a5bc..16c0405ff28a 100644
--- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
@@ -29,7 +29,7 @@ using namespace hierarchy_ucp;
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucphier1_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
-    void * pRet = 0;
+    void * pRet = nullptr;
 
     uno::Reference< lang::XMultiServiceFactory > xSMgr(
             static_cast< lang::XMultiServiceFactory * >(
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index ecdbe2d34af0..c0929f272865 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -165,7 +165,7 @@ Content* Content::create(
         {
             // Client explicitly requested a folder!
             if ( !aProps.bIsFolder )
-                return 0;
+                return nullptr;
         }
 
         uno::Reference< ucb::XContentIdentifier > xId
@@ -205,7 +205,7 @@ Content* Content::create(
             const ucb::ContentInfo& Info )
 {
     if ( Info.Type.isEmpty() )
-        return 0;
+        return nullptr;
 
     PackageUri aURI( Identifier->getContentIdentifier() );
 
@@ -213,7 +213,7 @@ Content* Content::create(
                 getContentType( aURI.getScheme(), true ) ) &&
          !Info.Type.equalsIgnoreAsciiCase(
                 getContentType( aURI.getScheme(), false ) ) )
-        return 0;
+        return nullptr;
 
     uno::Reference< container::XHierarchicalNameAccess > xPackage;
 
@@ -326,11 +326,11 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
 uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
     throw( uno::RuntimeException, std::exception )
 {
-    cppu::OTypeCollection * pCollection = 0;
+    cppu::OTypeCollection * pCollection = nullptr;
 
     if ( isFolder() )
     {
-        static cppu::OTypeCollection* pFolderTypes = 0;
+        static cppu::OTypeCollection* pFolderTypes = nullptr;
 
         pCollection = pFolderTypes;
         if ( !pCollection )
@@ -363,7 +363,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
     }
     else
     {
-        static cppu::OTypeCollection* pDocumentTypes = 0;
+        static cppu::OTypeCollection* pDocumentTypes = nullptr;
 
         pCollection = pDocumentTypes;
         if ( !pCollection )
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 3a0ed717b723..64ebe11b3f69 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -106,7 +106,7 @@ using namespace package_ucp;
 ContentProvider::ContentProvider(
             const uno::Reference< uno::XComponentContext >& rxContext )
 : ::ucbhelper::ContentProviderImplHelper( rxContext ),
-  m_pPackages( 0 )
+  m_pPackages( nullptr )
 {
 }
 
diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx
index da77c329b048..256ce82fcfbe 100644
--- a/ucb/source/ucp/package/pkgservices.cxx
+++ b/ucb/source/ucp/package/pkgservices.cxx
@@ -28,7 +28,7 @@ using namespace com::sun::star;
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucppkg1_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
-    void * pRet = 0;
+    void * pRet = nullptr;
 
     uno::Reference< lang::XMultiServiceFactory > xSMgr(
         static_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 19d4247dc82c..6438156c5767 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -107,7 +107,7 @@ Content* Content::create(
     if ( !Content::loadData( pProvider,
                              Uri( Identifier->getContentIdentifier() ),
                              aProps ) )
-        return 0;
+        return nullptr;
 
     return new Content( rxContext, pProvider, Identifier, aProps );
 }
@@ -121,12 +121,12 @@ Content* Content::create(
             const ucb::ContentInfo& Info )
 {
     if ( Info.Type.isEmpty() )
-        return 0;
+        return nullptr;
 
     if ( Info.Type != TDOC_FOLDER_CONTENT_TYPE && Info.Type != TDOC_STREAM_CONTENT_TYPE )
     {
         OSL_FAIL( "Content::create - unsupported content type!" );
-        return 0;
+        return nullptr;
     }
 
     return new Content( rxContext, pProvider, Identifier, Info );
@@ -220,11 +220,11 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
 uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
     throw( uno::RuntimeException, std::exception )
 {
-    cppu::OTypeCollection * pCollection = 0;
+    cppu::OTypeCollection * pCollection = nullptr;
 
     if ( m_aProps.isContentCreator() )
     {
-        static cppu::OTypeCollection* pFolderTypes = 0;
+        static cppu::OTypeCollection* pFolderTypes = nullptr;
 
         pCollection = pFolderTypes;
         if ( !pCollection )
@@ -257,7 +257,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
     }
     else
     {
-        static cppu::OTypeCollection* pDocumentTypes = 0;
+        static cppu::OTypeCollection* pDocumentTypes = nullptr;
 
         pCollection = pDocumentTypes;
         if ( !pCollection )
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index 0777123c83ba..888af77f29e4 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
@@ -84,7 +84,7 @@ struct DataSupplier_Impl
             const rtl::Reference< Content >& rContent,
             sal_Int32 nOpenMode )
     : m_xContent( rContent ), m_xContext( rxContext ),
-      m_pNamesOfChildren( 0 ), m_nOpenMode( nOpenMode ),
+      m_pNamesOfChildren( nullptr ), m_nOpenMode( nOpenMode ),
       m_bCountFinal( false ), m_bThrowException( false )
     {}
     ~DataSupplier_Impl();
@@ -398,7 +398,7 @@ bool ResultSetDataSupplier::queryNamesOfChildren()
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
-    if ( m_pImpl->m_pNamesOfChildren == 0 )
+    if ( m_pImpl->m_pNamesOfChildren == nullptr )
     {
         uno::Sequence< OUString > * pNamesOfChildren
             = new uno::Sequence< OUString >();
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
index 801e61e265db..047e3eaa3ea8 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
@@ -105,7 +105,7 @@ namespace tdoc_ucp {
                     const css::lang::EventObject & Source )
                 throw ( css::uno::RuntimeException, std::exception ) override;
 
-            void Dispose() { m_pManager = 0; }
+            void Dispose() { m_pManager = nullptr; }
 
         private:
             OfficeDocumentsManager * m_pManager;
diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
index 1bf11291c760..9398d5d23157 100644
--- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
@@ -136,7 +136,7 @@ InteractionSupplyPassword::getImplementationId()
 uno::Sequence< uno::Type > SAL_CALL InteractionSupplyPassword::getTypes()
     throw( uno::RuntimeException, std::exception )
 {
-    static cppu::OTypeCollection * pCollection = 0;
+    static cppu::OTypeCollection * pCollection = nullptr;
     if ( !pCollection )
     {
         osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx
index 1051e356da53..f8a558ebc761 100644
--- a/ucb/source/ucp/tdoc/tdoc_services.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_services.cxx
@@ -32,7 +32,7 @@ using namespace tdoc_ucp;
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucptdoc1_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
-    void * pRet = 0;
+    void * pRet = nullptr;
 
     uno::Reference< lang::XMultiServiceFactory > xSMgr(
             static_cast< lang::XMultiServiceFactory * >(
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx
index 63f0de7f3d19..64244aa9123b 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx
@@ -209,7 +209,7 @@ const PropertyValue * ContentProperties::get(
 
             ++it;
         }
-        return 0;
+        return nullptr;
     }
     else
         return &(*it).second;
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
index 819be1e1d9b7..c512199a800b 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
@@ -64,7 +64,7 @@ class DAVResourceAccess
     std::vector< NeonUri > m_aRedirectURIs;
 
 public:
-    DAVResourceAccess() : m_xSessionFactory( 0 ) {}
+    DAVResourceAccess() : m_xSessionFactory( nullptr ) {}
     DAVResourceAccess( const css::uno::Reference< css::uno::XComponentContext > & rxContext,
                        rtl::Reference< DAVSessionFactory > const & rSessionFactory,
                        const OUString & rURL );
diff --git a/ucb/source/ucp/webdav-neon/LinkSequence.cxx b/ucb/source/ucp/webdav-neon/LinkSequence.cxx
index a365e080be61..b75fee4b5f9b 100644
--- a/ucb/source/ucp/webdav-neon/LinkSequence.cxx
+++ b/ucb/source/ucp/webdav-neon/LinkSequence.cxx
@@ -44,7 +44,7 @@ struct LinkSequenceParseContext
     bool hasDestination;
 
     LinkSequenceParseContext()
-    : pLink( 0 ), hasSource( false ), hasDestination( false ) {}
+    : pLink( nullptr ), hasSource( false ), hasDestination( false ) {}
     ~LinkSequenceParseContext() { delete pLink; }
 };
 
@@ -62,7 +62,7 @@ extern "C" int LinkSequence_startelement_callback(
     const char *name,
     const char ** )
 {
-    if ( name != 0 )
+    if ( name != nullptr )
     {
         switch ( parent )
         {
diff --git a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx
index 22a2d5b07388..2f7ac4182804 100644
--- a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx
+++ b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx
@@ -43,7 +43,7 @@ struct LockEntrySequenceParseContext
     bool hasType;
 
     LockEntrySequenceParseContext()
-    : pEntry( 0 ), hasScope( false ), hasType( false ) {}
+    : pEntry( nullptr ), hasScope( false ), hasType( false ) {}
     ~LockEntrySequenceParseContext() { delete pEntry; }
 };
 
@@ -64,7 +64,7 @@ extern "C" int LockEntrySequence_startelement_callback(
     const char *name,
     const char ** )
 {
-    if ( name != 0 )
+    if ( name != nullptr )
     {
         switch ( parent )
         {
diff --git a/ucb/source/ucp/webdav-neon/LockSequence.cxx b/ucb/source/ucp/webdav-neon/LockSequence.cxx
index d5ce74e16046..8d57e764d83d 100644
--- a/ucb/source/ucp/webdav-neon/LockSequence.cxx
+++ b/ucb/source/ucp/webdav-neon/LockSequence.cxx
@@ -49,7 +49,7 @@ struct LockSequenceParseContext
     bool hasTimeout;
 
     LockSequenceParseContext()
-    : pLock( 0 ), hasLockScope( false ), hasLockType( false ),
+    : pLock( nullptr ), hasLockScope( false ), hasLockType( false ),
       hasDepth( false ), hasHREF( false ), hasTimeout( false ) {}
 
     ~LockSequenceParseContext() { delete pLock; }
@@ -77,7 +77,7 @@ extern "C" int LockSequence_startelement_callback(
     const char *name,
     const char ** )
 {
-    if ( name != 0 )
+    if ( name != nullptr )
     {
         switch ( parent )
         {
diff --git a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
index 9ad1bcfe37b9..4d7dc9180643 100644
--- a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
@@ -41,11 +41,11 @@ void process_headers( ne_request * req,
                       DAVResource & rResource,
                       const std::vector< OUString > & rHeaderNames )
 {
-    void * cursor = NULL;
+    void * cursor = nullptr;
     const char * name, *value;
 
     while ( ( cursor = ne_response_header_iterate( req, cursor,
-                                                   &name, &value ) ) != NULL ) {
+                                                   &name, &value ) ) != nullptr ) {
         OUString aHeaderName( OUString::createFromAscii( name ) );
         OUString aHeaderValue( OUString::createFromAscii( value ) );
 
diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
index deef57085606..705d79c86486 100644
--- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
@@ -259,8 +259,8 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
             DAVProperties::createNeonPropName(
                 inPropNames[ theIndex ], thePropNames[ theIndex ] );
         }
-        thePropNames[ theIndex ].nspace = NULL;
-        thePropNames[ theIndex ].name   = NULL;
+        thePropNames[ theIndex ].nspace = nullptr;
+        thePropNames[ theIndex ].name   = nullptr;
 
         {
             osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex );
@@ -282,7 +282,7 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
         nError = ne_simple_propfind( inSession,
                                      inPath,
                                      inDepth,
-                                     NULL, // 0 == allprop
+                                     nullptr, // 0 == allprop
                                      NPFR_propfind_results,
                                      &ioResources );
     }
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 2c1705c57f14..6ce8651078eb 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -165,23 +165,23 @@ struct NeonRequestContext
     DAVResource *                          pResource;
 
     explicit NeonRequestContext( uno::Reference< io::XOutputStream > & xOutStrm )
-    : xOutputStream( xOutStrm ), xInputStream( 0 ),
-      pHeaderNames( 0 ), pResource( 0 ) {}
+    : xOutputStream( xOutStrm ), xInputStream( nullptr ),
+      pHeaderNames( nullptr ), pResource( nullptr ) {}
 
     explicit NeonRequestContext( const rtl::Reference< NeonInputStream > & xInStrm )
-    : xOutputStream( 0 ), xInputStream( xInStrm ),
-      pHeaderNames( 0 ), pResource( 0 ) {}
+    : xOutputStream( nullptr ), xInputStream( xInStrm ),
+      pHeaderNames( nullptr ), pResource( nullptr ) {}
 
     NeonRequestContext( uno::Reference< io::XOutputStream > & xOutStrm,
                         const std::vector< OUString > & inHeaderNames,
                         DAVResource & ioResource )
-    : xOutputStream( xOutStrm ), xInputStream( 0 ),
+    : xOutputStream( xOutStrm ), xInputStream( nullptr ),
       pHeaderNames( &inHeaderNames ), pResource( &ioResource ) {}
 
     NeonRequestContext( const rtl::Reference< NeonInputStream > & xInStrm,
                         const std::vector< OUString > & inHeaderNames,
                         DAVResource & ioResource )
-    : xOutputStream( 0 ), xInputStream( xInStrm ),
+    : xOutputStream( nullptr ), xInputStream( xInStrm ),
       pHeaderNames( &inHeaderNames ), pResource( &ioResource ) {}
 };
 
@@ -419,7 +419,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata,
             OStringToOUString( sEECertB64, RTL_TEXTENCODING_ASCII_US ) ) );
 
     ne_free( eeCertB64 );
-    eeCertB64 = 0;
+    eeCertB64 = nullptr;
 
     std::vector< uno::Reference< security::XCertificate > > vecCerts;
     const ne_ssl_certificate * issuerCert = cert;
@@ -429,7 +429,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata,
         //the returned value is const ! Therefore it does not need to be freed
         //with ne_ssl_cert_free, which takes a non-const argument
         issuerCert = ne_ssl_cert_signedby( issuerCert );
-        if ( NULL == issuerCert )
+        if ( nullptr == issuerCert )
             break;
 
         char * imCertB64 = ne_ssl_cert_export( issuerCert );
@@ -527,7 +527,7 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req,
             if ( !(*it).second.aContentType.isEmpty() )
             {
                 char * pData = headers->data;
-                if ( strstr( pData, "Content-Type:" ) == NULL )
+                if ( strstr( pData, "Content-Type:" ) == nullptr )
                 {
                     OString aType
                         = OUStringToOString( (*it).second.aContentType,
@@ -540,7 +540,7 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req,
             if ( !(*it).second.aReferer.isEmpty() )
             {
                 char * pData = headers->data;
-                if ( strstr( pData, "Referer:" ) == NULL )
+                if ( strstr( pData, "Referer:" ) == nullptr )
                 {
                     OString aReferer
                         = OUStringToOString( (*it).second.aReferer,
@@ -591,7 +591,7 @@ NeonSession::NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFa
     : DAVSession( rSessionFactory )
     , m_nProxyPort( 0 )
     , m_aFlags( rFlags )
-    , m_pHttpSession( 0 )
+    , m_pHttpSession( nullptr )
     , m_pRequestData( new RequestDataMap )
     , m_rProxyDecider( rProxyDecider )
 {
@@ -609,7 +609,7 @@ NeonSession::~NeonSession( )
             osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex );
             ne_session_destroy( m_pHttpSession );
         }
-        m_pHttpSession = 0;
+        m_pHttpSession = nullptr;
     }
     delete static_cast< RequestDataMap * >( m_pRequestData );
 }
@@ -629,7 +629,7 @@ void NeonSession::Init()
 
     bool bCreateNewSession = false;
 
-    if ( m_pHttpSession == 0 )
+    if ( m_pHttpSession == nullptr )
     {
         // Ensure that Neon sockets are initialized
         osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex );
@@ -686,7 +686,7 @@ void NeonSession::Init()
                 osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex );
                 ne_session_destroy( m_pHttpSession );
             }
-            m_pHttpSession = 0;
+            m_pHttpSession = nullptr;
             bCreateNewSession = true;
         }
     }
@@ -708,7 +708,7 @@ void NeonSession::Init()
                 m_nPort );
         }
 
-        if ( m_pHttpSession == 0 )
+        if ( m_pHttpSession == nullptr )
             throw DAVException( DAVException::DAV_SESSION_CREATE,
                                 NeonUri::makeConnectionEndPointString(
                                     m_aHostName, m_nPort ) );
@@ -953,7 +953,7 @@ void NeonSession::PROPPATCH( const OUString & inPath,
                                                    aStringValue ) )
                 {
                     // Error!
-                    pItems[ n ].value = 0;
+                    pItems[ n ].value = nullptr;
                     theRetVal = NE_ERROR;
                     nPropCount = n + 1;
                     break;
@@ -972,7 +972,7 @@ void NeonSession::PROPPATCH( const OUString & inPath,
                     else
                     {
                         // Error!
-                        pItems[ n ].value = 0;
+                        pItems[ n ].value = nullptr;
                         theRetVal = NE_ERROR;
                         nPropCount = n + 1;
                         break;
@@ -982,7 +982,7 @@ void NeonSession::PROPPATCH( const OUString & inPath,
                 {
                     OSL_FAIL( "NeonSession::PROPPATCH - unsupported type!" );
                     // Error!
-                    pItems[ n ].value = 0;
+                    pItems[ n ].value = nullptr;
                     theRetVal = NE_ERROR;
                     nPropCount = n + 1;
                     break;
@@ -995,7 +995,7 @@ void NeonSession::PROPPATCH( const OUString & inPath,
         else
         {
             pItems[ n ].type  = ne_propremove;
-            pItems[ n ].value = 0;
+            pItems[ n ].value = nullptr;
         }
     }
 
@@ -1005,7 +1005,7 @@ void NeonSession::PROPPATCH( const OUString & inPath,
 
         Init( rEnv );
 
-        pItems[ n ].name = 0;
+        pItems[ n ].name = nullptr;
 
         theRetVal = ne_proppatch( m_pHttpSession,
                                   OUStringToOString(
@@ -1347,7 +1347,7 @@ void NeonSession::LOCK( const OUString & inPath,
     // before issuing the lock command,
     // better check first if we already have one on this href
     if ( m_aNeonLockStore.findByUri(
-                         makeAbsoluteURL( inPath ) ) != 0 )
+                         makeAbsoluteURL( inPath ) ) != nullptr )
     {
         // we already own a lock for this href
         // no need to ask for another
@@ -1657,7 +1657,7 @@ void NeonSession::HandleError( int nError,
             if ( code == SC_LOCKED )
             {
                 if ( m_aNeonLockStore.findByUri(
-                         makeAbsoluteURL( inPath ) ) == 0 )
+                         makeAbsoluteURL( inPath ) ) == nullptr )
                 {
                     // locked by 3rd party
                     throw DAVException( DAVException::DAV_LOCKED );
@@ -1813,10 +1813,10 @@ int NeonSession::GET( ne_session * sess,
 
     if ( getheaders )
     {
-        void *cursor = NULL;
+        void *cursor = nullptr;
         const char *name, *value;
         while ( ( cursor = ne_response_header_iterate(
-                               req, cursor, &name, &value ) ) != NULL )
+                               req, cursor, &name, &value ) ) != nullptr )
         {
             char buffer[8192];
 
@@ -1828,7 +1828,7 @@ int NeonSession::GET( ne_session * sess,
     if ( ret == NE_OK && ne_get_status( req )->klass != 2 )
         ret = NE_ERROR;
 
-    if ( dc != 0 )
+    if ( dc != nullptr )
         ne_decompress_destroy(dc);
 
     ne_request_destroy( req );
@@ -1872,7 +1872,7 @@ int NeonSession::POST( ne_session * sess,
     //struct get_context ctx;
     int ret;
 
-    RequestDataMap * pData = 0;
+    RequestDataMap * pData = nullptr;
 
     if ( !rContentType.isEmpty() || !rReferer.isEmpty() )
     {
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index fc0affa356e9..40a569cb196b 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -50,37 +50,37 @@ using namespace webdav_ucp;
 namespace {
 
 const ne_uri g_sUriDefaultsHTTP  = { const_cast<char *>("http"),
-                                     NULL,
-                                     NULL,
+                                     nullptr,
+                                     nullptr,
                                      DEFAULT_HTTP_PORT,
-                                     NULL,
-                                     NULL,
-                                     NULL };
+                                     nullptr,
+                                     nullptr,
+                                     nullptr };
 const ne_uri g_sUriDefaultsHTTPS = { const_cast<char *>("https"),
-                                     NULL,
-                                     NULL,
+                                     nullptr,
+                                     nullptr,
                                      DEFAULT_HTTPS_PORT,
-                                     NULL,
-                                     NULL,
-                                     NULL };
+                                     nullptr,
+                                     nullptr,
+                                     nullptr };
 const ne_uri g_sUriDefaultsFTP   = { const_cast<char *>("ftp"),
-                                     NULL,
-                                     NULL,
+                                     nullptr,
+                                     nullptr,
                                      DEFAULT_FTP_PORT,
-                                     NULL,
-                                     NULL,
-                                     NULL };
+                                     nullptr,
+                                     nullptr,
+                                     nullptr };
 } // namespace
 
 NeonUri::NeonUri( const ne_uri * inUri )
     throw ( DAVException )
 {
-    if ( inUri == 0 )
+    if ( inUri == nullptr )
         throw DAVException( DAVException::DAV_INVALID_ARG );
 
     char * uri = ne_uri_unparse( inUri );
 
-    if ( uri == 0 )
+    if ( uri == nullptr )
         throw DAVException( DAVException::DAV_INVALID_ARG );
 
     init( OString( uri ), inUri );
diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
index 490e75b0c4da..a275f52c2087 100644
--- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
@@ -43,7 +43,7 @@ struct UCBDeadPropertyValueParseContext
     OUString * pType;
     OUString * pValue;
 
-    UCBDeadPropertyValueParseContext() : pType( 0 ), pValue( 0 ) {}
+    UCBDeadPropertyValueParseContext() : pType( nullptr ), pValue( nullptr ) {}
     ~UCBDeadPropertyValueParseContext() { delete pType; delete pValue; }
 };
 
@@ -77,7 +77,7 @@ extern "C" int UCBDeadPropertyValue_startelement_callback(
     const char *name,
     const char ** )
 {
-    if ( name != 0 )
+    if ( name != nullptr )
     {
         switch ( parent )
         {
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 2fa569d011d7..e843b516f777 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -256,11 +256,11 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
     {
     }
 
-    cppu::OTypeCollection * pCollection = 0;
+    cppu::OTypeCollection * pCollection = nullptr;
 
     if ( bFolder )
     {
-        static cppu::OTypeCollection* pFolderTypes = 0;
+        static cppu::OTypeCollection* pFolderTypes = nullptr;
 
         pCollection = pFolderTypes;
         if ( !pCollection )
@@ -293,7 +293,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
     }
     else
     {
-        static cppu::OTypeCollection* pDocumentTypes = 0;
+        static cppu::OTypeCollection* pDocumentTypes = nullptr;
 
         pCollection = pDocumentTypes;
         if ( !pCollection )
@@ -3487,7 +3487,7 @@ Content::ResourceType Content::getResourceType(
                 // resource is NON_DAV
                 eResourceType = NON_DAV;
             }
-            else if (networkAccessAllowed != 0)
+            else if (networkAccessAllowed != nullptr)
             {
                 *networkAccessAllowed = *networkAccessAllowed
                     && shouldAccessNetworkAfterException(e);
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index 67d4b3b4bfe6..90a57e5611db 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -136,7 +136,7 @@ private:
     ResourceType
     getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv,
                      const std::unique_ptr< DAVResourceAccess > & rResAccess,
-                     bool * networkAccessAllowed = 0)
+                     bool * networkAccessAllowed = nullptr)
         throw ( css::uno::Exception, std::exception );
 
     // Command "open"
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
index ce86fc0854de..caeeac3d5b76 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
@@ -54,7 +54,7 @@ ContentProvider::ContentProvider(
                 const uno::Reference< uno::XComponentContext >& rxContext )
 : ::ucbhelper::ContentProviderImplHelper( rxContext ),
   m_xDAVSessionFactory( new DAVSessionFactory() ),
-  m_pProps( 0 )
+  m_pProps( nullptr )
 {
 }
 
diff --git a/ucb/source/ucp/webdav-neon/webdavservices.cxx b/ucb/source/ucp/webdav-neon/webdavservices.cxx
index 8cf247511cc1..cd3468788fe5 100644
--- a/ucb/source/ucp/webdav-neon/webdavservices.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavservices.cxx
@@ -37,7 +37,7 @@ using namespace com::sun::star;
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpdav1_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
-    void * pRet = 0;
+    void * pRet = nullptr;
 
     uno::Reference< lang::XMultiServiceFactory > xSMgr(
             static_cast< lang::XMultiServiceFactory * >(