loplugin:nullptr (automatic rewrite)

Change-Id: Ibd0e6ae5e3243464b2484a009f2b4781bdaac471

15 files changed, 45 insertions, 45 deletions

diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx
index 7dda618c41b1..af074b0e147b 100644
--- a/include/comphelper/ChainablePropertySet.hxx
+++ b/include/comphelper/ChainablePropertySet.hxx
@@ -109,7 +109,7 @@ namespace comphelper
             throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException );
 
     public:
-        ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, SolarMutex* pMutex = NULL )
+        ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, SolarMutex* pMutex = nullptr )
             throw();
         virtual ~ChainablePropertySet()
             throw();
diff --git a/include/comphelper/IdPropArrayHelper.hxx b/include/comphelper/IdPropArrayHelper.hxx
index 62d86d6137af..18367b09f103 100644
--- a/include/comphelper/IdPropArrayHelper.hxx
+++ b/include/comphelper/IdPropArrayHelper.hxx
@@ -60,7 +60,7 @@ namespace comphelper
                 for (OIdPropertyArrayMap::iterator i = s_pMap->begin(); i != s_pMap->end(); ++i)
                     delete (*i).second;
                 delete s_pMap;
-                s_pMap = NULL;
+                s_pMap = nullptr;
             }
         }
 
@@ -87,7 +87,7 @@ namespace comphelper
     sal_Int32                       OIdPropertyArrayUsageHelper< TYPE >::s_nRefCount    = 0;
 
     template<class TYPE>
-    OIdPropertyArrayMap*            OIdPropertyArrayUsageHelper< TYPE >::s_pMap = NULL;
+    OIdPropertyArrayMap*            OIdPropertyArrayUsageHelper< TYPE >::s_pMap = nullptr;
 
 
     template <class TYPE>
@@ -95,7 +95,7 @@ namespace comphelper
     {
         ::osl::MutexGuard aGuard(OIdPropertyArrayUsageHelperMutex<TYPE>::get());
         // create the map if necessary
-        if (s_pMap == NULL)
+        if (s_pMap == nullptr)
             s_pMap = new OIdPropertyArrayMap();
         ++s_nRefCount;
     }
diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx
index 73d96ae1f469..c8818b5f658e 100644
--- a/include/comphelper/MasterPropertySet.hxx
+++ b/include/comphelper/MasterPropertySet.hxx
@@ -98,7 +98,7 @@ namespace comphelper
             throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException );
 
     public:
-        MasterPropertySet( comphelper::MasterPropertySetInfo* pInfo, SolarMutex* pMutex = NULL )
+        MasterPropertySet( comphelper::MasterPropertySetInfo* pInfo, SolarMutex* pMutex = nullptr )
             throw();
         virtual ~MasterPropertySet()
             throw();
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index 5844f70f896b..fdfeba6587bd 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -49,7 +49,7 @@ namespace comphelper
 
     public:
         OSelectionChangeListener(::osl::Mutex& _rMutex)
-            : m_pAdapter(NULL), m_rMutex(_rMutex) { }
+            : m_pAdapter(nullptr), m_rMutex(_rMutex) { }
         virtual ~OSelectionChangeListener();
 
         virtual void _selectionChanged( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException) = 0;
diff --git a/include/comphelper/SettingsHelper.hxx b/include/comphelper/SettingsHelper.hxx
index 5bc33644b4d1..5ed0029643ec 100644
--- a/include/comphelper/SettingsHelper.hxx
+++ b/include/comphelper/SettingsHelper.hxx
@@ -40,7 +40,7 @@ namespace comphelper
         public ChainablePropertySet
     {
     public:
-        ChainableHelperNoState ( ChainablePropertySetInfo *pInfo, SolarMutex* pMutex = NULL)
+        ChainableHelperNoState ( ChainablePropertySetInfo *pInfo, SolarMutex* pMutex = nullptr)
         : ChainablePropertySet ( pInfo, pMutex )
         {}
         virtual ~ChainableHelperNoState () throw( ) {}
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx
index 7b06a308f600..fbd5d6336497 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.hxx
@@ -68,8 +68,8 @@ namespace comphelper
             :sImplementationName()
             ,aSupportedServices()
             ,sSingletonName()
-            ,pComponentCreationFunc( NULL )
-            ,pFactoryCreationFunc( NULL )
+            ,pComponentCreationFunc( nullptr )
+            ,pFactoryCreationFunc( nullptr )
         {
         }
 
diff --git a/include/comphelper/container.hxx b/include/comphelper/container.hxx
index 376406734935..ceae9f3c5586 100644
--- a/include/comphelper/container.hxx
+++ b/include/comphelper/container.hxx
@@ -57,7 +57,7 @@ public:
 
     css::uno::Reference< css::uno::XInterface>    Next();
 
-    virtual void Invalidate() { m_xCurrentObject = NULL; }
+    virtual void Invalidate() { m_xCurrentObject = nullptr; }
 
 protected:
     virtual bool ShouldHandleElement(const css::uno::Reference< css::uno::XInterface>& /*rElement*/) { return true; }
diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx
index d4533c480a2c..ad973a21fe32 100644
--- a/include/comphelper/docpasswordhelper.hxx
+++ b/include/comphelper/docpasswordhelper.hxx
@@ -290,8 +290,8 @@ public:
                             const css::uno::Reference< css::task::XInteractionHandler >& rxInteractHandler,
                             const OUString& rDocumentUrl,
                             DocPasswordRequestType eRequestType,
-                            const ::std::vector< OUString >* pDefaultPasswords = 0,
-                            bool* pbIsDefaultPassword = 0 );
+                            const ::std::vector< OUString >* pDefaultPasswords = nullptr,
+                            bool* pbIsDefaultPassword = nullptr );
 
 private:
                         ~DocPasswordHelper();
diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx
index 6609c2aea095..f2b108d88631 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.hxx
@@ -140,14 +140,14 @@ public:
     bool            MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& );
 
     // get the stored representation for the object
-    css::uno::Reference < css::io::XInputStream > GetObjectStream( const css::uno::Reference < css::embed::XEmbeddedObject >&, OUString* pMediaType=0 );
+    css::uno::Reference < css::io::XInputStream > GetObjectStream( const css::uno::Reference < css::embed::XEmbeddedObject >&, OUString* pMediaType=nullptr );
     css::uno::Reference < css::io::XInputStream > GetObjectStream( const OUString& aName, OUString* pMediaType );
 
     // get the stored graphical representation for the object
-    css::uno::Reference < css::io::XInputStream > GetGraphicStream( const css::uno::Reference < css::embed::XEmbeddedObject >&, OUString* pMediaType=0 );
+    css::uno::Reference < css::io::XInputStream > GetGraphicStream( const css::uno::Reference < css::embed::XEmbeddedObject >&, OUString* pMediaType=nullptr );
 
     // get the stored graphical representation by the object name
-    css::uno::Reference < css::io::XInputStream > GetGraphicStream( const OUString& aName, OUString* pMediaType=0 );
+    css::uno::Reference < css::io::XInputStream > GetGraphicStream( const OUString& aName, OUString* pMediaType=nullptr );
 
     // add a graphical representation for an object
     bool            InsertGraphicStream( const css::uno::Reference < css::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType );
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index ff7c8dff0f38..e8987314ab5e 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -130,7 +130,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, _rMessage,
+                return impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ) );
             return false;
         }
@@ -140,7 +140,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, _rMessage,
+                return impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ) );
             return false;
@@ -151,7 +151,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, _rMessage,
+                return impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ) );
@@ -163,7 +163,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, _rMessage,
+                return impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -176,7 +176,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, _rMessage,
+                return impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -190,7 +190,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, _rMessage,
+                return impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -215,7 +215,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
+                return impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ) );
             return false;
         }
@@ -225,7 +225,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
+                return impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ) );
             return false;
@@ -236,7 +236,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
+                return impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ) );
@@ -248,7 +248,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
+                return impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -261,7 +261,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
+                return impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -275,7 +275,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
+                return impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -497,7 +497,7 @@ namespace comphelper
         ResourceBasedEventLogger(
             const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
             const sal_Char* _pResourceBundleBaseName,
-            const sal_Char* _pAsciiLoggerName = NULL
+            const sal_Char* _pAsciiLoggerName = nullptr
         );
 
 
@@ -508,7 +508,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Int32 _nMessageResID ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, impl_loadStringMessage_nothrow( _nMessageResID ) );
+                return impl_log( _nLogLevel, nullptr, nullptr, impl_loadStringMessage_nothrow( _nMessageResID ) );
             return false;
         }
 
@@ -523,7 +523,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Int32 _nMessageResID, ARGTYPE1 _argument1 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, impl_loadStringMessage_nothrow( _nMessageResID ),
+                return impl_log( _nLogLevel, nullptr, nullptr, impl_loadStringMessage_nothrow( _nMessageResID ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ) );
             return false;
         }
@@ -533,7 +533,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Int32 _nMessageResID, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, impl_loadStringMessage_nothrow( _nMessageResID ),
+                return impl_log( _nLogLevel, nullptr, nullptr, impl_loadStringMessage_nothrow( _nMessageResID ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ) );
             return false;
@@ -544,7 +544,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Int32 _nMessageResID, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, impl_loadStringMessage_nothrow( _nMessageResID ),
+                return impl_log( _nLogLevel, nullptr, nullptr, impl_loadStringMessage_nothrow( _nMessageResID ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ) );
@@ -556,7 +556,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Int32 _nMessageResID, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, impl_loadStringMessage_nothrow( _nMessageResID ),
+                return impl_log( _nLogLevel, nullptr, nullptr, impl_loadStringMessage_nothrow( _nMessageResID ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -569,7 +569,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Int32 _nMessageResID, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, impl_loadStringMessage_nothrow( _nMessageResID ),
+                return impl_log( _nLogLevel, nullptr, nullptr, impl_loadStringMessage_nothrow( _nMessageResID ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -583,7 +583,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Int32 _nMessageResID, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, impl_loadStringMessage_nothrow( _nMessageResID ),
+                return impl_log( _nLogLevel, nullptr, nullptr, impl_loadStringMessage_nothrow( _nMessageResID ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index 8fc366bcf658..f598236d703d 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -120,7 +120,7 @@ public:
     */
     OPropertyArrayAggregationHelper(const css::uno::Sequence< css::beans::Property>& _rProperties,
                                     const css::uno::Sequence< css::beans::Property>& _rAggProperties,
-                                    IPropertyInfoService* _pInfoService = NULL,
+                                    IPropertyInfoService* _pInfoService = nullptr,
                                     sal_Int32 _nFirstAggregateId = DEFAULT_AGGREGATE_PROPERTY_ID);
 
 
diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx
index c78f736eb956..0f8fe7ebc36a 100644
--- a/include/comphelper/proparrhlp.hxx
+++ b/include/comphelper/proparrhlp.hxx
@@ -54,7 +54,7 @@ public:
         if (!--s_nRefCount)
         {
             delete s_pProps;
-            s_pProps = NULL;
+            s_pProps = nullptr;
         }
     }
 
@@ -104,7 +104,7 @@ protected:
         Beware of the lifetime of the returned object, as it has to exist 'til the last instance
         of this class dies.
     */
-    virtual IPropertyInfoService* getInfoService() const { return NULL; }
+    virtual IPropertyInfoService* getInfoService() const { return nullptr; }
 
     /** the return value is used for the construction of the OPropertyArrayAggregationHelper.
     */
@@ -115,7 +115,7 @@ template<class TYPE>
 sal_Int32                       OPropertyArrayUsageHelper< TYPE >::s_nRefCount  = 0;
 
 template<class TYPE>
-::cppu::IPropertyArrayHelper*   OPropertyArrayUsageHelper< TYPE >::s_pProps = NULL;
+::cppu::IPropertyArrayHelper*   OPropertyArrayUsageHelper< TYPE >::s_pProps = nullptr;
 
 template <class TYPE>
 OPropertyArrayUsageHelper<TYPE>::OPropertyArrayUsageHelper()
diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx
index f6ba60a9580c..ac4eb02cd26d 100644
--- a/include/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
@@ -48,7 +48,7 @@ namespace comphelper
 
     public:
         OPropertyChangeListener(::osl::Mutex& _rMutex)
-            : m_pAdapter(NULL), m_rMutex(_rMutex) { }
+            : m_pAdapter(nullptr), m_rMutex(_rMutex) { }
         virtual ~OPropertyChangeListener();
 
         virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent)
diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx
index cb9a6f304d07..4447364d005a 100644
--- a/include/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.hxx
@@ -338,7 +338,7 @@ template< typename T >
 inline void* component_getFactoryHelper( const sal_Char* pImplName, void* pRet,
                                          const T& s )
 {
-    if( pRet == 0 )
+    if( pRet == nullptr )
         return s.getFactory( pImplName );
     return pRet;
 }
@@ -347,7 +347,7 @@ template< typename T, typename... Args >
 inline void* component_getFactoryHelper( const sal_Char* pImplName, void* pRet,
                                          const T& s, const Args&... args )
 {
-    if( pRet == 0 )
+    if( pRet == nullptr )
         return component_getFactoryHelper( pImplName, s.getFactory( pImplName ), args... );
     return pRet;
 }
@@ -356,7 +356,7 @@ template< typename... Args >
 inline void* component_getFactoryHelper( const sal_Char* pImplName,
                                          const Args&... args )
 {
-    void* pRet = 0;
+    void* pRet = nullptr;
     return component_getFactoryHelper( pImplName, pRet, args... );
 }
 
diff --git a/include/comphelper/servicehelper.hxx b/include/comphelper/servicehelper.hxx
index 3d825b10fadf..622556616fd2 100644
--- a/include/comphelper/servicehelper.hxx
+++ b/include/comphelper/servicehelper.hxx
@@ -31,7 +31,7 @@ private:
 public:
     UnoTunnelIdInit() : m_aSeq(16)
     {
-        rtl_createUuid( reinterpret_cast<sal_uInt8*>(m_aSeq.getArray()), 0, sal_True );
+        rtl_createUuid( reinterpret_cast<sal_uInt8*>(m_aSeq.getArray()), nullptr, sal_True );
     }
     const css::uno::Sequence< sal_Int8 >& getSeq() const { return m_aSeq; }
 };
@@ -71,7 +71,7 @@ classname* classname::getImplementation( const uno::Reference< uno::XInterface >
     if( xUT.is() ) \
         return reinterpret_cast<classname*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( classname::getUnoTunnelId() ))); \
     else \
-        return NULL; \
+        return nullptr; \
 }
 
 #define UNO3_GETIMPLEMENTATION_IMPL( classname )\