loplugin:nullptr (automatic rewrite)

Change-Id: Ib80c434598481ca0d05c800991fea9b30ef329f8

54 files changed, 195 insertions, 195 deletions

diff --git a/include/unotools/configpaths.hxx b/include/unotools/configpaths.hxx
index 0d460c6fd3ff..b6f1e78f71ac 100644
--- a/include/unotools/configpaths.hxx
+++ b/include/unotools/configpaths.hxx
@@ -73,7 +73,7 @@ namespace utl
 
     */
     UNOTOOLS_DLLPUBLIC OUString extractFirstFromConfigurationPath(
-        OUString const& _sInPath, OUString* _sOutPath = 0);
+        OUString const& _sInPath, OUString* _sOutPath = nullptr);
 
     /** check whether a path is to a nested node with respect to a parent path.
 
diff --git a/include/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx
index fe98e3d4dc64..9dfc2388b4ed 100644
--- a/include/unotools/itemholderbase.hxx
+++ b/include/unotools/itemholderbase.hxx
@@ -89,7 +89,7 @@ enum EItem
 struct TItemInfo
 {
     TItemInfo()
-        : pItem(0)
+        : pItem(nullptr)
         , eItem(E_USEROPTIONS)
     {
     }
diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx
index f24ed86f8c44..98398d98ea5d 100644
--- a/include/unotools/mediadescriptor.hxx
+++ b/include/unotools/mediadescriptor.hxx
@@ -256,7 +256,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap
         css::uno::Sequence< css::beans::NamedValue > requestAndVerifyDocPassword(
             comphelper::IDocPasswordVerifier& rVerifier,
             comphelper::DocPasswordRequestType eRequestType,
-            const ::std::vector< OUString >* pDefaultPasswords = 0 );
+            const ::std::vector< OUString >* pDefaultPasswords = nullptr );
 
     // helper
     private:
diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx
index c911298d87d3..4a4729873511 100644
--- a/include/unotools/streamwrap.hxx
+++ b/include/unotools/streamwrap.hxx
@@ -48,7 +48,7 @@ protected:
     SvStream*       m_pSvStream;
     bool        m_bSvStreamOwner : 1;
     OInputStreamWrapper()
-                    { m_pSvStream = 0; m_bSvStreamOwner = false; }
+                    { m_pSvStream = nullptr; m_bSvStreamOwner = false; }
     void            SetStream(SvStream* _pStream, bool bOwner )
                     { m_pSvStream = _pStream; m_bSvStreamOwner = bOwner; }
 
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index 40ff667c0e44..a5a12d1158b3 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -59,7 +59,7 @@ public:
                     The temporary object is created in the local file system, even if there is no UCB that can access it.
                     If the given folder is part of the local file system, the TempFile is created in this folder.
                     */
-                    TempFile( const OUString* pParent=NULL, bool bDirectory=false );
+                    TempFile( const OUString* pParent=nullptr, bool bDirectory=false );
 
                     /**
                     Same as above; additionally the name starts with some given characters followed by a counter ( example:
@@ -67,7 +67,7 @@ public:
                     The extension string may be f.e. ".txt" or "", if no extension string is given, ".tmp" is used
                         @param  _bStartWithZero If set to false names will be generated like "abc","abc0","abc1"
                     */
-                    TempFile( const OUString& rLeadingChars, bool _bStartWithZero=true, const OUString* pExtension=NULL, const OUString* pParent=NULL, bool bDirectory=false);
+                    TempFile( const OUString& rLeadingChars, bool _bStartWithZero=true, const OUString* pExtension=nullptr, const OUString* pParent=nullptr, bool bDirectory=false);
 
                     /**
                     TempFile will be removed from disk in dtor if EnableKillingFile(true) was called before.
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 92690bdfa68b..d90c07990c18 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -143,10 +143,10 @@ public:
     */
     bool SearchForward( const OUString &rStr,
                         sal_Int32* pStart, sal_Int32* pEnd,
-                        css::util::SearchResult* pRes = 0 );
+                        css::util::SearchResult* pRes = nullptr );
     bool SearchBackward( const OUString &rStr,
                         sal_Int32* pStart, sal_Int32* pEnd,
-                        css::util::SearchResult* pRes = 0 );
+                        css::util::SearchResult* pRes = nullptr );
 
     void SetLocale( const css::util::SearchOptions& rOpt,
                     const css::lang::Locale& rLocale );
diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx
index dac41c3f2812..47e34bc830b7 100644
--- a/include/unotools/ucbstreamhelper.hxx
+++ b/include/unotools/ucbstreamhelper.hxx
@@ -53,13 +53,13 @@ namespace utl
     {
     public:
         static SvStream*    CreateStream( const OUString& rFileName, StreamMode eOpenMode,
-                                          UcbLockBytesHandler* pHandler=0 );
+                                          UcbLockBytesHandler* pHandler=nullptr );
         static SvStream*    CreateStream( const OUString& rFileName, StreamMode eOpenMode,
                                           css::uno::Reference < css::task::XInteractionHandler >,
-                                          UcbLockBytesHandler* pHandler=0 );
+                                          UcbLockBytesHandler* pHandler=nullptr );
         static SvStream*    CreateStream( const OUString& rFileName, StreamMode eOpenMode,
                                           bool bFileExists,
-                                UcbLockBytesHandler* pHandler=0 );
+                                UcbLockBytesHandler* pHandler=nullptr );
         static SvStream*    CreateStream( css::uno::Reference < css::io::XInputStream > xStream );
         static SvStream*    CreateStream( css::uno::Reference < css::io::XStream > xStream );
         static SvStream*    CreateStream( css::uno::Reference < css::io::XInputStream > xStream, bool bCloseStream );
diff --git a/include/unotools/xmlaccelcfg.hxx b/include/unotools/xmlaccelcfg.hxx
index 7f5c56527afe..e1ce2b3c123a 100644
--- a/include/unotools/xmlaccelcfg.hxx
+++ b/include/unotools/xmlaccelcfg.hxx
@@ -41,7 +41,7 @@ class OReadAccelatorDocumentHandler : public css::xml::sax::XDocumentHandler,
             m_nElementDepth( 0 ),
             m_bAcceleratorMode( false ),
             m_bItemCloseExpected( false ),
-            m_xLocator( 0 ),
+            m_xLocator( nullptr ),
             m_aReadAcceleratorList( aNewAcceleratorItemList ) {}
         virtual ~OReadAccelatorDocumentHandler() {}
 
diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index 3ea79605a11d..e411a9c937cc 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx
@@ -123,14 +123,14 @@ void AccessibleRelationSetHelperImpl::AddRelation(const AccessibleRelation& rRel
 //=====  internal  ============================================================
 
 AccessibleRelationSetHelper::AccessibleRelationSetHelper ()
-    : mpHelperImpl(NULL)
+    : mpHelperImpl(nullptr)
 {
     mpHelperImpl = new AccessibleRelationSetHelperImpl();
 }
 
 AccessibleRelationSetHelper::AccessibleRelationSetHelper (const AccessibleRelationSetHelper& rHelper)
     : cppu::WeakImplHelper1<XAccessibleRelationSet>()
-    , mpHelperImpl(NULL)
+    , mpHelperImpl(nullptr)
 {
     if (rHelper.mpHelperImpl)
         mpHelperImpl = new AccessibleRelationSetHelperImpl(*rHelper.mpHelperImpl);
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx
index 2ed4117be4cb..7c0e100fc49c 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.cxx
@@ -126,13 +126,13 @@ inline void AccessibleStateSetHelperImpl::RemoveState(sal_Int16 aState)
 //=====  internal  ============================================================
 
 AccessibleStateSetHelper::AccessibleStateSetHelper ()
-    : mpHelperImpl(NULL)
+    : mpHelperImpl(nullptr)
 {
     mpHelperImpl = new AccessibleStateSetHelperImpl();
 }
 
 AccessibleStateSetHelper::AccessibleStateSetHelper ( const sal_Int64 _nInitialStates )
-    : mpHelperImpl(NULL)
+    : mpHelperImpl(nullptr)
 {
     mpHelperImpl = new AccessibleStateSetHelperImpl();
     mpHelperImpl->AddStates( _nInitialStates );
@@ -140,7 +140,7 @@ AccessibleStateSetHelper::AccessibleStateSetHelper ( const sal_Int64 _nInitialSt
 
 AccessibleStateSetHelper::AccessibleStateSetHelper (const AccessibleStateSetHelper& rHelper)
     : cppu::WeakImplHelper1<XAccessibleStateSet>()
-    , mpHelperImpl(NULL)
+    , mpHelperImpl(nullptr)
 {
     if (rHelper.mpHelperImpl)
         mpHelperImpl = new AccessibleStateSetHelperImpl(*rHelper.mpHelperImpl);
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index 3ad6fc81eded..d25d12981d20 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -422,9 +422,9 @@ static void addMissingDirectoryError(OUStringBuffer& _rBuf, OUString const& _aPa
     _rBuf.append(IS_MISSING).append(PERIOD);
 }
 
-static void addUnexpectedError(OUStringBuffer& _rBuf, AsciiString _sExtraInfo = NULL)
+static void addUnexpectedError(OUStringBuffer& _rBuf, AsciiString _sExtraInfo = nullptr)
 {
-    if (NULL == _sExtraInfo)
+    if (nullptr == _sExtraInfo)
         _sExtraInfo = "An internal failure occurred";
 
     _rBuf.appendAscii(_sExtraInfo).append(PERIOD);
@@ -736,7 +736,7 @@ bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rValue,
     OUString uri;
     rtl::Bootstrap::get( "BRAND_BASE_DIR", uri);
     rtl::Bootstrap aData( uri + "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") );
-    if ( aData.getHandle() == NULL )
+    if ( aData.getHandle() == nullptr )
         // version.ini (versionrc) doesn't exist
         return false;
 
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index c3e324ef5ff2..d7572381e103 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -291,7 +291,7 @@ Sequence< OUString > SvtCommandOptions_Impl::impl_GetPropertyNames()
 //  DON'T DO IT IN YOUR HEADER!
 //  see definition for further information
 
-SvtCommandOptions_Impl*     SvtCommandOptions::m_pDataContainer = NULL;
+SvtCommandOptions_Impl*     SvtCommandOptions::m_pDataContainer = nullptr;
 sal_Int32                   SvtCommandOptions::m_nRefCount      = 0;
 
 //  constructor
@@ -303,7 +303,7 @@ SvtCommandOptions::SvtCommandOptions()
     // Increase our refcount ...
     ++m_nRefCount;
     // ... and initialize our data container only if it not already exist!
-    if( m_pDataContainer == NULL )
+    if( m_pDataContainer == nullptr )
     {
         m_pDataContainer = new SvtCommandOptions_Impl;
         ItemHolder1::holdConfigItem(E_CMDOPTIONS);
@@ -323,7 +323,7 @@ SvtCommandOptions::~SvtCommandOptions()
     if( m_nRefCount <= 0 )
     {
         delete m_pDataContainer;
-        m_pDataContainer = NULL;
+        m_pDataContainer = nullptr;
     }
 }
 
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index bb4ea726fa95..69f52ec12afd 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -575,7 +575,7 @@ void SvtCompatibilityOptions_Impl::impl_ExpandPropertyNames(
 //  DON'T DO IT IN YOUR HEADER!
 //  see definition for further information
 
-SvtCompatibilityOptions_Impl*   SvtCompatibilityOptions::m_pDataContainer = NULL;
+SvtCompatibilityOptions_Impl*   SvtCompatibilityOptions::m_pDataContainer = nullptr;
 sal_Int32                       SvtCompatibilityOptions::m_nRefCount = 0;
 
 //  constructor
@@ -587,7 +587,7 @@ SvtCompatibilityOptions::SvtCompatibilityOptions()
     // Increase our refcount ...
     ++m_nRefCount;
     // ... and initialize our data container only if it not already exist!
-    if( m_pDataContainer == NULL )
+    if( m_pDataContainer == nullptr )
     {
         m_pDataContainer = new SvtCompatibilityOptions_Impl;
         ItemHolder1::holdConfigItem(E_COMPATIBILITY);
@@ -607,7 +607,7 @@ SvtCompatibilityOptions::~SvtCompatibilityOptions()
     if( m_nRefCount <= 0 )
     {
         delete m_pDataContainer;
-        m_pDataContainer = NULL;
+        m_pDataContainer = nullptr;
     }
 }
 
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 9b4ed5f8ef1e..bd45e394aaa8 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -470,8 +470,8 @@ bool ConfigItem::PutProperties( const Sequence< OUString >& rNames,
     {
         Sequence< OUString >    lNames;
         Sequence< Any >         lValues;
-        const OUString*         pNames  = NULL;
-        const Any*              pValues = NULL;
+        const OUString*         pNames  = nullptr;
+        const Any*              pValues = nullptr;
         sal_Int32               nNameCount;
         if(( m_nMode & ConfigItemMode::AllLocales ) == ConfigItemMode::AllLocales )
         {
@@ -574,7 +574,7 @@ void ConfigItem::RemoveChangesListener()
         try
         {
             xChgNot->removeChangesListener( xChangeLstnr );
-            xChangeLstnr = 0;
+            xChangeLstnr = nullptr;
         }
         catch (const Exception&)
         {
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index c1c91f838692..39e93de26d18 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -48,12 +48,12 @@ public:
     }
 
     ~RegisterConfigItemHelper() {
-        if (item_ != 0) {
+        if (item_ != nullptr) {
             manager_.removeConfigItem(*item_);
         }
     }
 
-    void keep() { item_ = 0; }
+    void keep() { item_ = nullptr; }
 
 private:
     utl::ConfigManager & manager_;
@@ -189,7 +189,7 @@ void utl::ConfigManager::removeConfigItem(utl::ConfigItem & item) {
 }
 
 void utl::ConfigManager::registerConfigItem(utl::ConfigItem * item) {
-    OSL_ASSERT(item != 0);
+    OSL_ASSERT(item != nullptr);
     items_.push_back(item);
 }
 
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index 3e521acaf6b1..847dbc9434f4 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -60,8 +60,8 @@ namespace utl
             // reset _all_ interfaces if _one_ of them is not supported
             if (!m_xHierarchyAccess.is() || !m_xDirectAccess.is())
             {
-                m_xHierarchyAccess = NULL;
-                m_xDirectAccess = NULL;
+                m_xHierarchyAccess = nullptr;
+                m_xDirectAccess = nullptr;
             }
 
             // now for the non-critical interfaces
@@ -474,13 +474,13 @@ namespace utl
             {
                 DBG_UNHANDLED_EXCEPTION();
             }
-            return NULL;
+            return nullptr;
         }
 
         Reference< XInterface > lcl_createConfigurationRoot( const Reference< XMultiServiceFactory >& i_rxConfigProvider,
             const OUString& i_rNodePath, const bool i_bUpdatable, const sal_Int32 i_nDepth, const bool i_bLazyWrite )
         {
-            ENSURE_OR_RETURN( i_rxConfigProvider.is(), "invalid provider", NULL );
+            ENSURE_OR_RETURN( i_rxConfigProvider.is(), "invalid provider", nullptr );
             try
             {
                 ::comphelper::NamedValueCollection aArgs;
@@ -502,7 +502,7 @@ namespace utl
             {
                 DBG_UNHANDLED_EXCEPTION();
             }
-            return NULL;
+            return nullptr;
         }
     }
 
diff --git a/unotools/source/config/configpaths.cxx b/unotools/source/config/configpaths.cxx
index 73d33fc93a9e..7b31d428b592 100644
--- a/unotools/source/config/configpaths.cxx
+++ b/unotools/source/config/configpaths.cxx
@@ -168,7 +168,7 @@ OUString extractFirstFromConfigurationPath(OUString const& _sInPath, OUString* _
     OUString sResult = (nEnd >= 0) ? _sInPath.copy(nStart, nEnd-nStart) : _sInPath;
     lcl_resolveCharEntities(sResult);
 
-    if (_sOutPath != 0)
+    if (_sOutPath != nullptr)
     {
         *_sOutPath = (nSep >= 0) ? _sInPath.copy(nSep + 1) : OUString();
     }
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 13b9df0d6d24..7ec71c5e5e5b 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -55,7 +55,7 @@ namespace utl
 
         void bind( void* _pLocation, const Type& _rType );
 
-        bool                    isBound( ) const        { return ( ltUnbound != eLocationType ) && ( NULL != pLocation ); }
+        bool                    isBound( ) const        { return ( ltUnbound != eLocationType ) && ( nullptr != pLocation ); }
         const OUString&  getPath( ) const        { return sRelativePath; }
         LocationType            getLocType( ) const     { return eLocationType; }
         void*                   getLocation( ) const    { return pLocation; }
@@ -67,7 +67,7 @@ namespace utl
     NodeValueAccessor::NodeValueAccessor( const OUString& _rNodePath )
         :sRelativePath( _rNodePath )
         ,eLocationType( ltUnbound )
-        ,pLocation( NULL )
+        ,pLocation( nullptr )
     {
     }
 
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index 340455586eca..081848d018c5 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -101,7 +101,7 @@ private:
 
 // global ----------------------------------------------------------------
 
-static SvtDefaultOptions_Impl*  pOptions = NULL;
+static SvtDefaultOptions_Impl*  pOptions = nullptr;
 static sal_Int32                nRefCount = 0;
 
 typedef OUString SvtDefaultOptions_Impl:: *PathStrPtr;
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index e7799ba3018d..51baeca8de48 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -115,7 +115,7 @@ class SvtDynMenu
             lProperties[OFFSET_IMAGEIDENTIFIER].Name = PROPERTYNAME_IMAGEIDENTIFIER;
             lProperties[OFFSET_TARGETNAME     ].Name = PROPERTYNAME_TARGETNAME;
 
-            while( pList != NULL )
+            while( pList != nullptr )
             {
                 for( vector< SvtDynMenuEntry >::const_iterator pItem =pList->begin();
                                                          pItem!=pList->end();
@@ -141,7 +141,7 @@ class SvtDynMenu
                 if( pList == &lSetupEntries )
                     pList = &lUserEntries;
                 else
-                    pList = NULL;
+                    pList = nullptr;
             }
             return lResult;
         }
@@ -571,7 +571,7 @@ void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence
 //  DON'T DO IT IN YOUR HEADER!
 //  see definition for further information
 
-SvtDynamicMenuOptions_Impl*     SvtDynamicMenuOptions::m_pDataContainer = NULL;
+SvtDynamicMenuOptions_Impl*     SvtDynamicMenuOptions::m_pDataContainer = nullptr;
 sal_Int32                       SvtDynamicMenuOptions::m_nRefCount      = 0;
 
 //  constructor
@@ -583,7 +583,7 @@ SvtDynamicMenuOptions::SvtDynamicMenuOptions()
     // Increase our refcount ...
     ++m_nRefCount;
     // ... and initialize our data container only if it not already exist!
-    if( m_pDataContainer == NULL )
+    if( m_pDataContainer == nullptr )
     {
         m_pDataContainer = new SvtDynamicMenuOptions_Impl;
         ItemHolder1::holdConfigItem(E_DYNAMICMENUOPTIONS);
@@ -603,7 +603,7 @@ SvtDynamicMenuOptions::~SvtDynamicMenuOptions()
     if( m_nRefCount <= 0 )
     {
         delete m_pDataContainer;
-        m_pDataContainer = NULL;
+        m_pDataContainer = nullptr;
     }
 }
 
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index d7f5ecd65564..82b1b578bbff 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -305,7 +305,7 @@ bool SAL_CALL GlobalEventConfig_Impl::hasElements(  ) throw (RuntimeException)
 // and now the wrapper
 
 //initialize static member
-GlobalEventConfig_Impl*     GlobalEventConfig::m_pImpl = NULL;
+GlobalEventConfig_Impl*     GlobalEventConfig::m_pImpl = nullptr;
 sal_Int32                   GlobalEventConfig::m_nRefCount      = 0;
 
 GlobalEventConfig::GlobalEventConfig()
@@ -315,7 +315,7 @@ GlobalEventConfig::GlobalEventConfig()
     // Increase our refcount ...
     ++m_nRefCount;
     // ... and initialize our data container only if it not already exist!
-    if( m_pImpl == NULL )
+    if( m_pImpl == nullptr )
     {
         m_pImpl = new GlobalEventConfig_Impl;
         ItemHolder1::holdConfigItem(E_EVENTCFG);
@@ -333,7 +333,7 @@ GlobalEventConfig::~GlobalEventConfig()
     if( m_nRefCount <= 0 )
     {
         delete m_pImpl;
-        m_pImpl = NULL;
+        m_pImpl = nullptr;
     }
 }
 
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index 30b27c85438e..73aa9a05a3bd 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -244,7 +244,7 @@ Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetPropertyNames()
 //  DON'T DO IT IN YOUR HEADER!
 //  see definition for further information
 
-SvtExtendedSecurityOptions_Impl*    SvtExtendedSecurityOptions::m_pDataContainer    = NULL;
+SvtExtendedSecurityOptions_Impl*    SvtExtendedSecurityOptions::m_pDataContainer    = nullptr;
 sal_Int32                           SvtExtendedSecurityOptions::m_nRefCount         = 0;
 
 //  constructor
@@ -256,7 +256,7 @@ SvtExtendedSecurityOptions::SvtExtendedSecurityOptions()
     // Increase our refcount ...
     ++m_nRefCount;
     // ... and initialize our data container only if it not already exist!
-    if( m_pDataContainer == NULL )
+    if( m_pDataContainer == nullptr )
     {
        m_pDataContainer = new SvtExtendedSecurityOptions_Impl;
 
@@ -277,7 +277,7 @@ SvtExtendedSecurityOptions::~SvtExtendedSecurityOptions()
     if( m_nRefCount <= 0 )
     {
         delete m_pDataContainer;
-        m_pDataContainer = NULL;
+        m_pDataContainer = nullptr;
     }
 }
 
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index df4e45597c55..483af6fe5a6a 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -444,7 +444,7 @@ static const char* const aImplKillLeadingList[] =
     "ipa",
     "sazanami",
     "kochi",
-    NULL
+    nullptr
 };
 
 static const char* const aImplKillTrailingList[] =
@@ -494,14 +494,14 @@ static const char* const aImplKillTrailingList[] =
     "24cpi",
     "scale",
     "pc",
-    NULL
+    nullptr
 };
 
 static const char* const aImplKillTrailingWithExceptionsList[] =
 {
-    "ce", "monospace", "oldface", NULL,
-    "ps", "caps", NULL,
-    NULL
+    "ce", "monospace", "oldface", nullptr,
+    "ps", "caps", nullptr,
+    nullptr
 };
 
 struct ImplFontAttrWeightSearchData
@@ -527,7 +527,7 @@ static ImplFontAttrWeightSearchData const aImplWeightAttrSearchList[] =
 {   "ultralight",           WEIGHT_ULTRALIGHT },
 {   "light",                WEIGHT_LIGHT },
 {   "medium",               WEIGHT_MEDIUM },
-{   NULL,                   WEIGHT_DONTKNOW },
+{   nullptr,                   WEIGHT_DONTKNOW },
 };
 
 struct ImplFontAttrWidthSearchData
@@ -548,7 +548,7 @@ static ImplFontAttrWidthSearchData const aImplWidthAttrSearchList[] =
 {   "condensed",            WIDTH_CONDENSED },
 {   "cond",                 WIDTH_CONDENSED },
 {   "cn",                   WIDTH_CONDENSED },
-{   NULL,                   WIDTH_DONTKNOW },
+{   nullptr,                   WIDTH_DONTKNOW },
 };
 
 struct ImplFontAttrTypeSearchData
@@ -618,7 +618,7 @@ static ImplFontAttrTypeSearchData const aImplTypeAttrSearchList[] =
 {   "ms",                   ImplFontAttrs::None },
 {   "cpi",                  ImplFontAttrs::None },
 {   "no",                   ImplFontAttrs::None },
-{   NULL,                   ImplFontAttrs::None },
+{   nullptr,                   ImplFontAttrs::None },
 };
 
 static bool ImplKillLeading( OUString& rName, const char* const* ppStr )
@@ -1104,7 +1104,7 @@ const FontNameAttr* FontSubstConfiguration::getSubstInfo( const OUString& rFontN
         const LanguageTag& rLanguageTag ) const
 {
     if( rFontName.isEmpty() )
-        return NULL;
+        return nullptr;
 
     // search if a  (language dep.) replacement table for the given font exists
     // fallback is english
@@ -1142,7 +1142,7 @@ const FontNameAttr* FontSubstConfiguration::getSubstInfo( const OUString& rFontN
             }
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx
index c6b32073022a..ad6fa0b8ff90 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -247,7 +247,7 @@ Sequence< OUString > SvtFontOptions_Impl::impl_GetPropertyNames()
 //  DON'T DO IT IN YOUR HEADER!
 //  see definition for further information
 
-SvtFontOptions_Impl*    SvtFontOptions::m_pDataContainer    = NULL;
+SvtFontOptions_Impl*    SvtFontOptions::m_pDataContainer    = nullptr;
 sal_Int32               SvtFontOptions::m_nRefCount         = 0;
 
 //  constructor
@@ -259,7 +259,7 @@ SvtFontOptions::SvtFontOptions()
     // Increase our refcount ...
     ++m_nRefCount;
     // ... and initialize our data container only if it not already exist!
-    if( m_pDataContainer == NULL )
+    if( m_pDataContainer == nullptr )
     {
         m_pDataContainer = new SvtFontOptions_Impl;
 
@@ -280,7 +280,7 @@ SvtFontOptions::~SvtFontOptions()
     if( m_nRefCount <= 0 )
     {
         delete m_pDataContainer;
-        m_pDataContainer = NULL;
+        m_pDataContainer = nullptr;
     }
 }
 
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 0b2e12c825c8..134bee95d108 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -548,7 +548,7 @@ void SvtHistoryOptions_Impl::DeleteItem(EHistoryType eHistory, const OUString& s
 // DON'T DO IT IN YOUR HEADER!
 // see definition for further information
 
-SvtHistoryOptions_Impl*  SvtHistoryOptions::m_pDataContainer = NULL;
+SvtHistoryOptions_Impl*  SvtHistoryOptions::m_pDataContainer = nullptr;
 sal_Int32     SvtHistoryOptions::m_nRefCount  = 0;
 
 // constructor
@@ -560,7 +560,7 @@ SvtHistoryOptions::SvtHistoryOptions()
     // Increase our refcount ...
     ++m_nRefCount;
     // ... and initialize our data container only if it not already exist!
-    if( m_pDataContainer == NULL )
+    if( m_pDataContainer == nullptr )
     {
         m_pDataContainer = new SvtHistoryOptions_Impl;
 
@@ -581,7 +581,7 @@ SvtHistoryOptions::~SvtHistoryOptions()
     if( m_nRefCount <= 0 )
     {
         delete m_pDataContainer;
-        m_pDataContainer = NULL;
+        m_pDataContainer = nullptr;
     }
 }
 
diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index 64534ebcd135..c2b5d0ed8055 100644
--- a/unotools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.cxx
@@ -247,7 +247,7 @@ void ItemHolder1::impl_deleteItem(TItemInfo& rItem)
     if (rItem.pItem)
     {
         delete rItem.pItem;
-        rItem.pItem = 0;
+        rItem.pItem = nullptr;
     }
 }
 
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 9f834f3bbbbe..271abe33848b 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -256,9 +256,9 @@ static struct NamesToHdl
 {/* 31 */    "GrammarChecking/IsInteractiveCheck",            UPN_IS_GRAMMAR_INTERACTIVE,               UPH_IS_GRAMMAR_INTERACTIVE},
 
             /* similar to entry 0 (thus no own configuration entry) but with different property name and type */
-{            NULL,                                           UPN_DEFAULT_LANGUAGE,                      UPH_DEFAULT_LANGUAGE},
+{            nullptr,                                           UPN_DEFAULT_LANGUAGE,                      UPH_DEFAULT_LANGUAGE},
 
-{            NULL,                                            NULL,                                      -1}
+{            nullptr,                                            nullptr,                                      -1}
 };
 
 const uno::Sequence< OUString > SvtLinguConfigItem::GetPropertyNames()
@@ -290,7 +290,7 @@ bool SvtLinguConfigItem::GetHdlByName(
 
     if (bFullPropName)
     {
-        while (pEntry && pEntry->pFullPropName != NULL)
+        while (pEntry && pEntry->pFullPropName != nullptr)
         {
             if (rPropertyName.equalsAscii( pEntry->pFullPropName ))
             {
@@ -299,11 +299,11 @@ bool SvtLinguConfigItem::GetHdlByName(
             }
             ++pEntry;
         }
-        return pEntry && pEntry->pFullPropName != NULL;
+        return pEntry && pEntry->pFullPropName != nullptr;
     }
     else
     {
-        while (pEntry && pEntry->pPropName != NULL)
+        while (pEntry && pEntry->pPropName != nullptr)
         {
             if (rPropertyName.equalsAscii( pEntry->pPropName ))
             {
@@ -312,7 +312,7 @@ bool SvtLinguConfigItem::GetHdlByName(
             }
             ++pEntry;
         }
-        return pEntry && pEntry->pPropName != NULL;
+        return pEntry && pEntry->pPropName != nullptr;
     }
 }
 
@@ -330,9 +330,9 @@ uno::Any SvtLinguConfigItem::GetProperty( sal_Int32 nPropertyHandle ) const
 
     uno::Any aRes;
 
-    const sal_Int16 *pnVal = 0;
-    const bool  *pbVal = 0;
-    const sal_Int32 *pnInt32Val = 0;
+    const sal_Int16 *pnVal = nullptr;
+    const bool  *pbVal = nullptr;
+    const sal_Int32 *pnInt32Val = nullptr;
 
     const SvtLinguOptions &rOpt = const_cast< SvtLinguConfigItem * >(this)->aOpt;
     switch (nPropertyHandle)
@@ -427,9 +427,9 @@ bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno::Any
 
     bool bMod = false;
 
-    sal_Int16 *pnVal = 0;
-    bool  *pbVal = 0;
-    sal_Int32 *pnInt32Val = 0;
+    sal_Int16 *pnVal = nullptr;
+    bool  *pbVal = nullptr;
+    sal_Int32 *pnInt32Val = nullptr;
 
     SvtLinguOptions &rOpt = aOpt;
     switch (nPropertyHandle)
@@ -789,7 +789,7 @@ bool SvtLinguConfigItem::IsReadOnly( sal_Int32 nPropertyHandle ) const
     return bReadOnly;
 }
 
-static SvtLinguConfigItem *pCfgItem = 0;
+static SvtLinguConfigItem *pCfgItem = nullptr;
 static sal_Int32           nCfgItemRefCount = 0;
 
 static const char aG_SupportedDictionaryFormats[] = "SupportedDictionaryFormats";
@@ -816,7 +816,7 @@ SvtLinguConfig::~SvtLinguConfig()
     if (--nCfgItemRefCount <= 0)
     {
         delete pCfgItem;
-        pCfgItem = 0;
+        pCfgItem = nullptr;
     }
 }
 
diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx
index 72d16e864a55..1ca612afb753 100644
--- a/unotools/source/config/localisationoptions.cxx
+++ b/unotools/source/config/localisationoptions.cxx
@@ -222,7 +222,7 @@ Sequence< OUString > SvtLocalisationOptions_Impl::GetPropertyNames()
 //  DON'T DO IT IN YOUR HEADER!
 //  see definition for further information
 
-SvtLocalisationOptions_Impl*    SvtLocalisationOptions::m_pDataContainer    = NULL;
+SvtLocalisationOptions_Impl*    SvtLocalisationOptions::m_pDataContainer    = nullptr;
 sal_Int32                       SvtLocalisationOptions::m_nRefCount         = 0;
 
 //  constructor
@@ -234,7 +234,7 @@ SvtLocalisationOptions::SvtLocalisationOptions()
     // Increase our refcount ...
     ++m_nRefCount;
     // ... and initialize our data container only if it not already exist!
-    if( m_pDataContainer == NULL )
+    if( m_pDataContainer == nullptr )
     {
         m_pDataContainer = new SvtLocalisationOptions_Impl;
 
@@ -255,7 +255,7 @@ SvtLocalisationOptions::~SvtLocalisationOptions()
     if( m_nRefCount <= 0 )
     {
         delete m_pDataContainer;
-        m_pDataContainer = NULL;
+        m_pDataContainer = nullptr;
     }
 }
 
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index 5c7ff3fcbdbb..faf8fd7f9e80 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -33,7 +33,7 @@ using namespace com::sun::star::uno;
 namespace utl
 {
 
-static SfxMiscCfg* pOptions = NULL;
+static SfxMiscCfg* pOptions = nullptr;
 static sal_Int32 nRefCount = 0;
 
 class SfxMiscCfg : public utl::ConfigItem
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 828e15935d6d..fc29b3283b4f 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -756,7 +756,7 @@ void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< OUString >& lFa
 
     sal_Int32                   nPropertyStart  = 0;
     sal_Int32                   nNodeCount      = lFactories.getLength();
-    FactoryInfo*                pInfo           = NULL;
+    FactoryInfo*                pInfo           = nullptr;
     SvtModuleOptions::EFactory  eFactory;
 
     for( sal_Int32 nSetNode=0; nSetNode<nNodeCount; ++nSetNode )
@@ -828,7 +828,7 @@ void SvtModuleOptions_Impl::MakeReadonlyStatesAvailable()
 //  DON'T DO IT IN YOUR HEADER!
 //  see definition for further information
 
-SvtModuleOptions_Impl*  SvtModuleOptions::m_pDataContainer  = NULL;
+SvtModuleOptions_Impl*  SvtModuleOptions::m_pDataContainer  = nullptr;
 sal_Int32               SvtModuleOptions::m_nRefCount       = 0;
 
 /*-************************************************************************************************************
@@ -858,7 +858,7 @@ SvtModuleOptions::~SvtModuleOptions()
     if( m_nRefCount == 0 )
     {
         delete m_pDataContainer;
-        m_pDataContainer = NULL;
+        m_pDataContainer = nullptr;
     }
 }
 
diff --git a/unotools/source/config/options.cxx b/unotools/source/config/options.cxx
index 6483d1d3e7ba..28b64bb07119 100644
--- a/unotools/source/config/options.cxx
+++ b/unotools/source/config/options.cxx
@@ -26,7 +26,7 @@ using utl::ConfigurationBroadcaster;
 utl::ConfigurationListener::~ConfigurationListener() {}
 
 ConfigurationBroadcaster::ConfigurationBroadcaster()
-: mpList(0)
+: mpList(nullptr)
 , m_nBroadcastBlocked( 0 )
 , m_nBlockedHint( 0 )
 {
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 38fd49392eab..5b963b09e9b2 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -37,7 +37,7 @@ using namespace com::sun::star::uno;
 #define PAGES_NODE              "Pages"
 #define OPTIONS_NODE            "Options"
 
-static SvtOptionsDlgOptions_Impl*   pOptions = NULL;
+static SvtOptionsDlgOptions_Impl*   pOptions = nullptr;
 static sal_Int32                    nRefCount = 0;
 
 class SvtOptionsDlgOptions_Impl : public utl::ConfigItem
@@ -222,7 +222,7 @@ SvtOptionsDialogOptions::~SvtOptionsDialogOptions()
         if ( pOptions->IsModified() )
             pOptions->Commit();
         delete pOptions;
-        pOptions = NULL;
+        pOptions = nullptr;
     }
 }
 
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 2f4689c719b1..33fd23000fe8 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -161,7 +161,7 @@ class SvtPathOptions_Impl
 
 // global ----------------------------------------------------------------
 
-static SvtPathOptions_Impl* pOptions = NULL;
+static SvtPathOptions_Impl* pOptions = nullptr;
 static sal_Int32 nRefCount = 0;
 
 // functions -------------------------------------------------------------
diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx
index b14efe94b0d7..1b5650873cc6 100644
--- a/unotools/source/config/printwarningoptions.cxx
+++ b/unotools/source/config/printwarningoptions.cxx
@@ -225,7 +225,7 @@ Sequence< OUString > SvtPrintWarningOptions_Impl::impl_GetPropertyNames()
 //  DON'T DO IT IN YOUR HEADER!
 //  see definition for further information
 
-SvtPrintWarningOptions_Impl*    SvtPrintWarningOptions::m_pDataContainer = NULL;
+SvtPrintWarningOptions_Impl*    SvtPrintWarningOptions::m_pDataContainer = nullptr;
 sal_Int32                       SvtPrintWarningOptions::m_nRefCount = 0;
 
 //  constructor
@@ -237,7 +237,7 @@ SvtPrintWarningOptions::SvtPrintWarningOptions()
     // Increase our refcount ...
     ++m_nRefCount;
     // ... and initialize our data container only if it not already!
-    if( m_pDataContainer == NULL )
+    if( m_pDataContainer == nullptr )
     {
         m_pDataContainer = new SvtPrintWarningOptions_Impl();
         ItemHolder1::holdConfigItem(E_PRINTWARNINGOPTIONS);
@@ -257,7 +257,7 @@ SvtPrintWarningOptions::~SvtPrintWarningOptions()
     if( m_nRefCount <= 0 )
     {
         delete m_pDataContainer;
-        m_pDataContainer = NULL;
+        m_pDataContainer = nullptr;
     }
 }
 
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 928d4556ae40..06018f2c1d87 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -49,7 +49,7 @@ struct SvtLoadSaveOptions_Impl
     SvtLoadOptions_Impl* pLoadOpt;
 };
 
-static SvtLoadSaveOptions_Impl* pOptions = NULL;
+static SvtLoadSaveOptions_Impl* pOptions = nullptr;
 static sal_Int32           nRefCount = 0;
 
 class SvtSaveOptions_Impl : public utl::ConfigItem
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index df767dfeb620..fad440be2400 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -539,12 +539,12 @@ bool SvtSecurityOptions_Impl::GetOption( SvtSecurityOptions::EOption eOption, bo
             rpRO = &m_bROBlockUntrustedRefererLinks;
             break;
         default:
-            rpValue = NULL;
-            rpRO = NULL;
+            rpValue = nullptr;
+            rpRO = nullptr;
             break;
     }
 
-    return rpValue != NULL;
+    return rpValue != nullptr;
 }
 
 void SvtSecurityOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
@@ -944,7 +944,7 @@ Sequence< OUString > SvtSecurityOptions_Impl::GetPropertyNames()
 //  DON'T DO IT IN YOUR HEADER!
 //  see definition for further information
 
-SvtSecurityOptions_Impl*    SvtSecurityOptions::m_pDataContainer    = NULL;
+SvtSecurityOptions_Impl*    SvtSecurityOptions::m_pDataContainer    = nullptr;
 sal_Int32                   SvtSecurityOptions::m_nRefCount         = 0;
 
 SvtSecurityOptions::SvtSecurityOptions()
@@ -954,7 +954,7 @@ SvtSecurityOptions::SvtSecurityOptions()
     // Increase our refcount ...
     ++m_nRefCount;
     // ... and initialize our data container only if it not already exist!
-    if( m_pDataContainer == NULL )
+    if( m_pDataContainer == nullptr )
     {
         m_pDataContainer = new SvtSecurityOptions_Impl;
 
@@ -973,7 +973,7 @@ SvtSecurityOptions::~SvtSecurityOptions()
     if( m_nRefCount <= 0 )
     {
         delete m_pDataContainer;
-        m_pDataContainer = NULL;
+        m_pDataContainer = nullptr;
     }
 }
 
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index 09a55945ab00..6de88a677989 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -38,7 +38,7 @@ using namespace utl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-SvtSysLocaleOptions_Impl*   SvtSysLocaleOptions::pOptions = NULL;
+SvtSysLocaleOptions_Impl*   SvtSysLocaleOptions::pOptions = nullptr;
 sal_Int32                   SvtSysLocaleOptions::nRefCount = 0;
 namespace
 {
@@ -530,14 +530,14 @@ SvtSysLocaleOptions::~SvtSysLocaleOptions()
     if ( !--nRefCount )
     {
         delete pOptions;
-        pOptions = NULL;
+        pOptions = nullptr;
     }
 }
 
 // static
 Mutex& SvtSysLocaleOptions::GetMutex()
 {
-    static Mutex* pMutex = NULL;
+    static Mutex* pMutex = nullptr;
     if( !pMutex )
     {
         MutexGuard aGuard( Mutex::getGlobalMutex() );
@@ -698,7 +698,7 @@ void SvtSysLocaleOptions::ConfigurationChanged( utl::ConfigurationBroadcaster* p
     if ( nHint & SYSLOCALEOPTIONS_HINT_CURRENCY )
     {
         const Link<LinkParamNone*,void>& rLink = GetCurrencyChangeLink();
-        rLink.Call( NULL );
+        rLink.Call( nullptr );
     }
 
     ::utl::detail::Options::ConfigurationChanged( p, nHint );
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 77e294191e84..1ad1ad01be21 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -65,13 +65,13 @@
 
 //  initialization!
 
-SvtViewOptionsBase_Impl*     SvtViewOptions::m_pDataContainer_Dialogs    =   NULL    ;
+SvtViewOptionsBase_Impl*     SvtViewOptions::m_pDataContainer_Dialogs    =   nullptr    ;
 sal_Int32                    SvtViewOptions::m_nRefCount_Dialogs         =   0       ;
-SvtViewOptionsBase_Impl*     SvtViewOptions::m_pDataContainer_TabDialogs =   NULL    ;
+SvtViewOptionsBase_Impl*     SvtViewOptions::m_pDataContainer_TabDialogs =   nullptr    ;
 sal_Int32                    SvtViewOptions::m_nRefCount_TabDialogs      =   0       ;
-SvtViewOptionsBase_Impl*     SvtViewOptions::m_pDataContainer_TabPages   =   NULL    ;
+SvtViewOptionsBase_Impl*     SvtViewOptions::m_pDataContainer_TabPages   =   nullptr    ;
 sal_Int32                    SvtViewOptions::m_nRefCount_TabPages        =   0       ;
-SvtViewOptionsBase_Impl*     SvtViewOptions::m_pDataContainer_Windows    =   NULL    ;
+SvtViewOptionsBase_Impl*     SvtViewOptions::m_pDataContainer_Windows    =   nullptr    ;
 sal_Int32                    SvtViewOptions::m_nRefCount_Windows         =   0       ;
 
 /*-************************************************************************************************************
@@ -654,7 +654,7 @@ SvtViewOptions::~SvtViewOptions()
                                     if( m_nRefCount_Dialogs == 0 )
                                     {
                                         delete m_pDataContainer_Dialogs;
-                                        m_pDataContainer_Dialogs = NULL;
+                                        m_pDataContainer_Dialogs = nullptr;
                                     }
                                 }
                                 break;
@@ -665,7 +665,7 @@ SvtViewOptions::~SvtViewOptions()
                                     if( m_nRefCount_TabDialogs == 0 )
                                     {
                                         delete m_pDataContainer_TabDialogs;
-                                        m_pDataContainer_TabDialogs = NULL;
+                                        m_pDataContainer_TabDialogs = nullptr;
                                     }
                                 }
                                 break;
@@ -676,7 +676,7 @@ SvtViewOptions::~SvtViewOptions()
                                     if( m_nRefCount_TabPages == 0 )
                                     {
                                         delete m_pDataContainer_TabPages;
-                                        m_pDataContainer_TabPages = NULL;
+                                        m_pDataContainer_TabPages = nullptr;
                                     }
                                 }
                                 break;
@@ -687,7 +687,7 @@ SvtViewOptions::~SvtViewOptions()
                                     if( m_nRefCount_Windows == 0 )
                                     {
                                         delete m_pDataContainer_Windows;
-                                        m_pDataContainer_Windows = NULL;
+                                        m_pDataContainer_Windows = nullptr;
                                     }
                                 }
                                 break;
@@ -1047,22 +1047,22 @@ void SvtViewOptions::ReleaseOptions()
     if( --m_nRefCount_Dialogs == 0 )
     {
         delete m_pDataContainer_Dialogs;
-        m_pDataContainer_Dialogs = NULL;
+        m_pDataContainer_Dialogs = nullptr;
     }
     if( --m_nRefCount_TabDialogs == 0 )
     {
         delete m_pDataContainer_TabDialogs;
-        m_pDataContainer_TabDialogs = NULL;
+        m_pDataContainer_TabDialogs = nullptr;
     }
     if( --m_nRefCount_TabPages == 0 )
     {
         delete m_pDataContainer_TabPages;
-        m_pDataContainer_TabPages = NULL;
+        m_pDataContainer_TabPages = nullptr;
     }
     if( --m_nRefCount_Windows == 0 )
     {
         delete m_pDataContainer_Windows;
-        m_pDataContainer_Windows = NULL;
+        m_pDataContainer_Windows = nullptr;
     }
 }
 
diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx
index 887b5dc40204..95bfa1ed827c 100644
--- a/unotools/source/i18n/intlwrapper.cxx
+++ b/unotools/source/i18n/intlwrapper.cxx
@@ -28,9 +28,9 @@ IntlWrapper::IntlWrapper(
         :
         maLanguageTag( rLanguageTag ),
         m_xContext( rxContext ),
-        pLocaleData( NULL ),
-        pCollator( NULL ),
-        pCaseCollator( NULL )
+        pLocaleData( nullptr ),
+        pCollator( nullptr ),
+        pCaseCollator( nullptr )
 {
 }
 
@@ -39,9 +39,9 @@ IntlWrapper::IntlWrapper(
         :
         maLanguageTag( rLanguageTag ),
         m_xContext( comphelper::getProcessComponentContext() ),
-        pLocaleData( NULL ),
-        pCollator( NULL ),
-        pCaseCollator( NULL )
+        pLocaleData( nullptr ),
+        pCollator( nullptr ),
+        pCaseCollator( nullptr )
 {
 }
 
diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx
index bf45f21ea40f..ed8a3381ab97 100644
--- a/unotools/source/misc/componentresmodule.cxx
+++ b/unotools/source/misc/componentresmodule.cxx
@@ -43,7 +43,7 @@ namespace utl
 
     public:
         explicit OComponentResModuleImpl( const OString& _rResFilePrefix )
-            :m_pResources( NULL )
+            :m_pResources( nullptr )
             ,m_bInitialized( false )
             ,m_sResFilePrefix( _rResFilePrefix )
         {
@@ -65,7 +65,7 @@ namespace utl
 
     void OComponentResModuleImpl::freeResManager()
     {
-        delete m_pResources, m_pResources = NULL;
+        delete m_pResources, m_pResources = nullptr;
         m_bInitialized = false;
     }
 
diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx
index 08779571ca0c..c8f726b24ed3 100644
--- a/unotools/source/misc/eventlisteneradapter.cxx
+++ b/unotools/source/misc/eventlisteneradapter.cxx
@@ -106,7 +106,7 @@ namespace utl
     {
         stopAllComponentListening( );
         delete m_pImpl;
-        m_pImpl = NULL;
+        m_pImpl = nullptr;
     }
 
     void OEventListenerAdapter::stopComponentListening( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComp )
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 59c34b25ef2e..f60d285763e2 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1311,35 +1311,35 @@ static const RecodeTable aStarSymbolRecodeTable[] =
 {
     // the first two entries must be StarMath and StarBats; do not reorder!
     // reason: fgrep for FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS
-    {"starbats",        {aStarBatsTab,  "StarSymbol", NULL}},
-    {"starmath",        {aStarMathTab,  "StarSymbol", NULL}},
+    {"starbats",        {aStarBatsTab,  "StarSymbol", nullptr}},
+    {"starmath",        {aStarMathTab,  "StarSymbol", nullptr}},
 
-    {"symbol",          {aAdobeSymbolTab, "StarSymbol", NULL}},
-    {"standardsymbols", {aAdobeSymbolTab, "StarSymbol", NULL}},
-    {"standardsymbolsl",{aAdobeSymbolTab, "StarSymbol", NULL}},
+    {"symbol",          {aAdobeSymbolTab, "StarSymbol", nullptr}},
+    {"standardsymbols", {aAdobeSymbolTab, "StarSymbol", nullptr}},
+    {"standardsymbolsl",{aAdobeSymbolTab, "StarSymbol", nullptr}},
 
-    {"monotypesorts",   {aMonotypeSortsTab, "StarSymbol", NULL}},
+    {"monotypesorts",   {aMonotypeSortsTab, "StarSymbol", nullptr}},
 //  {"monotypesorts2",  {aMonotypeSorts2Tab, "StarSymbol", NULL}}
-    {"zapfdingbats",    {aMonotypeSortsTab, "StarSymbol", NULL}},  //ZapfDingbats=MonotypeSorts-X?
-    {"itczapfdingbats", {aMonotypeSortsTab, "StarSymbol", NULL}},
-    {"dingbats",        {aMonotypeSortsTab, "StarSymbol", NULL}},
-
-    {"webdings",        {aWebDingsTab,   "StarSymbol", NULL}},
-    {"wingdings",       {aWingDingsTab,  "StarSymbol", NULL}},
-    {"wingdings2",      {aWingDings2Tab, "StarSymbol", NULL}},
-    {"wingdings3",      {aWingDings3Tab, "StarSymbol", NULL}},
-    {"mtextra",         {aMTExtraTab, "StarSymbol", NULL}}
+    {"zapfdingbats",    {aMonotypeSortsTab, "StarSymbol", nullptr}},  //ZapfDingbats=MonotypeSorts-X?
+    {"itczapfdingbats", {aMonotypeSortsTab, "StarSymbol", nullptr}},
+    {"dingbats",        {aMonotypeSortsTab, "StarSymbol", nullptr}},
+
+    {"webdings",        {aWebDingsTab,   "StarSymbol", nullptr}},
+    {"wingdings",       {aWingDingsTab,  "StarSymbol", nullptr}},
+    {"wingdings2",      {aWingDings2Tab, "StarSymbol", nullptr}},
+    {"wingdings3",      {aWingDings3Tab, "StarSymbol", nullptr}},
+    {"mtextra",         {aMTExtraTab, "StarSymbol", nullptr}}
 };
 
 static const RecodeTable aAppleSymbolRecodeTable[] = {
-    {"symbol",         {aAdobeSymbolToAppleSymbolTab, "AppleSymbol", NULL}}
+    {"symbol",         {aAdobeSymbolToAppleSymbolTab, "AppleSymbol", nullptr}}
 };
 
-static ConvertChar aImplStarSymbolCvt = { NULL, "StarBats", ImplStarSymbolToStarBats };
+static ConvertChar aImplStarSymbolCvt = { nullptr, "StarBats", ImplStarSymbolToStarBats };
 
 const ConvertChar* ConvertChar::GetRecodeData( const OUString& rOrgFontName, const OUString& rMapFontName )
 {
-    const ConvertChar* pCvt = NULL;
+    const ConvertChar* pCvt = nullptr;
 
     // clean up and lowercase font name
     OUString aOrgName( GetEnglishSearchFontName( rOrgFontName ) );
@@ -1382,7 +1382,7 @@ const ConvertChar* ConvertChar::GetRecodeData( const OUString& rOrgFontName, con
 
 FontToSubsFontConverter CreateFontToSubsFontConverter( const OUString& rOrgName, FontToSubsFontFlags nFlags )
 {
-    const ConvertChar* pCvt = NULL;
+    const ConvertChar* pCvt = nullptr;
 
     OUString aName = GetEnglishSearchFontName( rOrgName );
 
diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx
index 81b402b8f619..94b6dbc85b57 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -317,7 +317,7 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] =
 {   "hiraginokakugothicpron", aHiraginoKakuGothicProN },
 {   "hiraginomarugothicpro", aHiraginoMaruGothicPro },
 {   "hiraginomarugothicpron", aHiraginoMaruGothicProN },
-{   NULL,                   NULL },
+{   nullptr,                   nullptr },
 };
 
 OUString StripScriptFromName(const OUString& _aName)
@@ -531,7 +531,7 @@ OUString GetSubsFontName( const OUString& rName, SubsFontFlags nFlags )
     {
         for( int i = 0; i < 3; i++ )
         {
-            const ::std::vector< OUString >* pVector = NULL;
+            const ::std::vector< OUString >* pVector = nullptr;
             switch( i )
             {
                 case 0:
diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index f59ed5413e66..41bb5b5d6eb2 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -707,7 +707,7 @@ bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, bool bLockFi
         try
         {
             css::uno::Reference< css::ucb::XContentIdentifier > xContId(
-                aContent.get().is() ? aContent.get()->getIdentifier() : 0 );
+                aContent.get().is() ? aContent.get()->getIdentifier() : nullptr );
 
             if ( xContId.is() )
                 aScheme = xContId->getContentProviderScheme();
diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index 8c15256b0ca9..303b31bedc46 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -33,7 +33,7 @@
 using namespace osl;
 using namespace com::sun::star;
 
-SvtSysLocale_Impl*  SvtSysLocale::pImpl = NULL;
+SvtSysLocale_Impl*  SvtSysLocale::pImpl = nullptr;
 sal_Int32           SvtSysLocale::nRefCount = 0;
 
 class SvtSysLocale_Impl : public utl::ConfigurationListener
@@ -53,7 +53,7 @@ private:
     void                        setDateAcceptancePatternsConfig();
 };
 
-SvtSysLocale_Impl::SvtSysLocale_Impl() : pCharClass(NULL)
+SvtSysLocale_Impl::SvtSysLocale_Impl() : pCharClass(nullptr)
 {
     pLocaleData = new LocaleDataWrapper( aSysLocaleOptions.GetRealLanguageTag() );
     setDateAcceptancePatternsConfig();
@@ -127,14 +127,14 @@ SvtSysLocale::~SvtSysLocale()
     if ( !--nRefCount )
     {
         delete pImpl;
-        pImpl = NULL;
+        pImpl = nullptr;
     }
 }
 
 // static
 Mutex& SvtSysLocale::GetMutex()
 {
-    static Mutex* pMutex = NULL;
+    static Mutex* pMutex = nullptr;
     if( !pMutex )
     {
         MutexGuard aGuard( Mutex::getGlobalMutex() );
diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx
index 5c74aeb00d10..40bc0664f73b 100644
--- a/unotools/source/streaming/streamhelper.cxx
+++ b/unotools/source/streaming/streamhelper.cxx
@@ -118,7 +118,7 @@ void SAL_CALL OInputStreamHelper::closeInput()
     if (!m_xLockBytes.Is())
         throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
 
-    m_xLockBytes = NULL;
+    m_xLockBytes = nullptr;
 }
 
 } // namespace utl
diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx
index 83275822d80f..05d3d93daec8 100644
--- a/unotools/source/streaming/streamwrap.cxx
+++ b/unotools/source/streaming/streamwrap.cxx
@@ -118,7 +118,7 @@ void SAL_CALL OInputStreamWrapper::closeInput() throw( css::io::NotConnectedExce
     if (m_bSvStreamOwner)
         delete m_pSvStream;
 
-    m_pSvStream = NULL;
+    m_pSvStream = nullptr;
 }
 
 void OInputStreamWrapper::checkConnected() const
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index 8865f99a4567..377babbcf9f9 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -40,7 +40,7 @@ typedef ::std::vector< OUString* > StringList_Impl;
 
 ::com::sun::star::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUString& rFolder, bool bFolder )
 {
-    StringList_Impl* pFiles = NULL;
+    StringList_Impl* pFiles = nullptr;
     try
     {
         ::ucbhelper::Content aCnt(
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index a8c2822dd318..fa093d73ab70 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -173,7 +173,7 @@ public:
     explicit SequentialTokens(bool showZero): m_value(0), m_show(showZero) {}
 
     bool next(OUString * token) override {
-        assert(token != 0);
+        assert(token != nullptr);
         if (m_value == SAL_MAX_UINT32) {
             return false;
         }
@@ -193,7 +193,7 @@ public:
     UniqueTokens(): m_count(0) {}
 
     bool next(OUString * token) override {
-        assert(token != 0);
+        assert(token != nullptr);
         // Because of the shared globalValue, no single instance of UniqueTokens
         // is guaranteed to exhaustively test all 36^6 possible values, but stop
         // after that many attempts anyway:
@@ -302,12 +302,12 @@ OUString CreateTempName_Impl( const OUString* pParent, bool bKeep, bool bDir = t
 #endif
 #endif
     UniqueTokens t;
-    return lcl_createName(aEyeCatcher, t, 0, pParent, bDir, bKeep, false);
+    return lcl_createName(aEyeCatcher, t, nullptr, pParent, bDir, bKeep, false);
 }
 
 OUString TempFile::CreateTempName()
 {
-    OUString aName(CreateTempName_Impl( 0, false ));
+    OUString aName(CreateTempName_Impl( nullptr, false ));
 
     // convert to file URL
     OUString aTmp;
@@ -317,7 +317,7 @@ OUString TempFile::CreateTempName()
 }
 
 TempFile::TempFile( const OUString* pParent, bool bDirectory )
-    : pStream( 0 )
+    : pStream( nullptr )
     , bIsDirectory( bDirectory )
     , bKillingFileEnabled( false )
 {
@@ -325,7 +325,7 @@ TempFile::TempFile( const OUString* pParent, bool bDirectory )
 }
 
 TempFile::TempFile( const OUString& rLeadingChars, bool _bStartWithZero, const OUString* pExtension, const OUString* pParent, bool bDirectory)
-    : pStream( 0 )
+    : pStream( nullptr )
     , bIsDirectory( bDirectory )
     , bKillingFileEnabled( false )
 {
@@ -375,7 +375,7 @@ SvStream* TempFile::GetStream( StreamMode eMode )
         if (!aName.isEmpty())
             pStream = new SvFileStream(aName, eMode);
         else
-            pStream = new SvMemoryStream(NULL, 0, eMode);
+            pStream = new SvMemoryStream(nullptr, 0, eMode);
     }
 
     return pStream;
@@ -386,7 +386,7 @@ void TempFile::CloseStream()
     if ( pStream )
     {
         delete pStream;
-        pStream = NULL;
+        pStream = nullptr;
     }
 }
 
@@ -418,7 +418,7 @@ OUString TempFile::SetTempNameBaseDirectory( const OUString &rBaseName )
         OUString &rTempNameBase_Impl = TempNameBase_Impl::get();
         rTempNameBase_Impl = rBaseName + "/";
 
-        TempFile aBase( NULL, true );
+        TempFile aBase( nullptr, true );
         if ( aBase.IsValid() )
             // use it in case of success
             rTempNameBase_Impl = aBase.aName;
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 61d2ece25f59..e9602a4022ef 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -186,7 +186,7 @@ bool utl::UCBContentHelper::IsFolder(OUString const & url) {
 bool utl::UCBContentHelper::GetTitle(
     OUString const & url, OUString * title)
 {
-    assert(title != 0);
+    assert(title != nullptr);
     try {
         return content(url).getPropertyValue("Title") >>= *title;
     } catch (css::uno::RuntimeException const &) {
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index be0e71c13ac3..c37f49086953 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -517,14 +517,14 @@ Moderator::Moderator(
       m_aContent(
           xContent,
           new UcbTaskEnvironment(
-              xInteract.is() ? new ModeratorsInteractionHandler(*this) : 0,
-              0),
+              xInteract.is() ? new ModeratorsInteractionHandler(*this) : nullptr,
+              nullptr),
           comphelper::getProcessComponentContext())
 {
     // now exchange the whole data sink stuff
     // with a thread safe version
 
-    Reference<XInterface> *pxSink = NULL;
+    Reference<XInterface> *pxSink = nullptr;
 
     PostCommandArgument2 aPostArg;
     OpenCommandArgument2 aOpenArg;
@@ -731,7 +731,7 @@ static bool UCBOpenContentSync(
     //        headers is valid
 
     Reference<XContentIdentifier> xContId(
-        xContent.is() ? xContent->getIdentifier() : 0 );
+        xContent.is() ? xContent->getIdentifier() : nullptr );
 
     OUString aScheme;
     if(xContId.is())
@@ -765,7 +765,7 @@ static bool UCBOpenContentSync(
     bool bAborted(false);
     bool bResultAchieved(false);
 
-    Moderator* pMod = 0;
+    Moderator* pMod = nullptr;
     try
     {
         pMod = new Moderator(xContent,xInteract,rArg);
@@ -964,7 +964,7 @@ static bool _UCBOpenContentSync(
     Reference < XInteractionHandler > xInteract )
 {
     ::ucbhelper::Content aContent(
-        xContent, new UcbTaskEnvironment( xInteract, 0 ),
+        xContent, new UcbTaskEnvironment( xInteract, nullptr ),
         comphelper::getProcessComponentContext() );
     Reference < XContentIdentifier > xIdent = xContent->getIdentifier();
     OUString aScheme = xIdent->getContentProviderScheme();
@@ -1043,7 +1043,7 @@ static bool _UCBOpenContentSync(
 
 UcbLockBytes::UcbLockBytes( UcbLockBytesHandler* pHandler )
     : m_aExpireDate( DateTime::EMPTY )
-    , m_xInputStream (NULL)
+    , m_xInputStream (nullptr)
     , m_xHandler( pHandler )
     , m_nError( ERRCODE_NONE )
     , m_bTerminated  (false)
@@ -1373,7 +1373,7 @@ ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const
 UcbLockBytesRef UcbLockBytes::CreateInputLockBytes( const Reference< XInputStream >& xInputStream )
 {
     if( !xInputStream.is() )
-        return NULL;
+        return nullptr;
 
     UcbLockBytesRef xLockBytes = new UcbLockBytes(nullptr);
     xLockBytes->setDontClose_Impl();
@@ -1385,7 +1385,7 @@ UcbLockBytesRef UcbLockBytes::CreateInputLockBytes( const Reference< XInputStrea
 UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference< XStream >& xStream )
 {
     if( !xStream.is() )
-        return NULL;
+        return nullptr;
 
     UcbLockBytesRef xLockBytes = new UcbLockBytes(nullptr);
     xLockBytes->setDontClose_Impl();
@@ -1398,7 +1398,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo
         StreamMode eOpenMode, const Reference < XInteractionHandler >& xInteractionHandler, UcbLockBytesHandler* pHandler )
 {
     if( !xContent.is() )
-        return NULL;
+        return nullptr;
 
     UcbLockBytesRef xLockBytes = new UcbLockBytes( pHandler );
     xLockBytes->SetSynchronMode( !pHandler );
diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx
index 0fda19bf52d0..00805d1c7a46 100644
--- a/unotools/source/ucbhelper/ucblockbytes.hxx
+++ b/unotools/source/ucbhelper/ucblockbytes.hxx
@@ -107,7 +107,7 @@ public:
                                             const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rProps,
                                             StreamMode eMode,
                                             const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& xInter,
-                                            UcbLockBytesHandler* pHandler=0 );
+                                            UcbLockBytesHandler* pHandler=nullptr );
 
     static UcbLockBytesRef  CreateInputLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xContent );
     static UcbLockBytesRef  CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream >& xContent );
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index c2e2149d7c61..11098986f9dc 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -44,7 +44,7 @@ static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMo
                                    Reference < XInteractionHandler > xInteractionHandler,
                                    UcbLockBytesHandler* pHandler, bool bEnsureFileExists )
 {
-    SvStream* pStream = NULL;
+    SvStream* pStream = nullptr;
     Reference< XUniversalContentBroker > ucb(
         UniversalContentBroker::create(
             comphelper::getProcessComponentContext() ) );
@@ -160,7 +160,7 @@ SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode e
 
 SvStream* UcbStreamHelper::CreateStream( Reference < XInputStream > xStream )
 {
-    SvStream* pStream = NULL;
+    SvStream* pStream = nullptr;
     UcbLockBytesRef xLockBytes = UcbLockBytes::CreateInputLockBytes( xStream );
     if ( xLockBytes.Is() )
     {
@@ -174,7 +174,7 @@ SvStream* UcbStreamHelper::CreateStream( Reference < XInputStream > xStream )
 
 SvStream* UcbStreamHelper::CreateStream( Reference < XStream > xStream )
 {
-    SvStream* pStream = NULL;
+    SvStream* pStream = nullptr;
     if ( xStream->getOutputStream().is() )
     {
         UcbLockBytesRef xLockBytes = UcbLockBytes::CreateLockBytes( xStream );
@@ -193,7 +193,7 @@ SvStream* UcbStreamHelper::CreateStream( Reference < XStream > xStream )
 
 SvStream* UcbStreamHelper::CreateStream( Reference < XInputStream > xStream, bool bCloseStream )
 {
-    SvStream* pStream = NULL;
+    SvStream* pStream = nullptr;
     UcbLockBytesRef xLockBytes = UcbLockBytes::CreateInputLockBytes( xStream );
     if ( xLockBytes.Is() )
     {
@@ -210,7 +210,7 @@ SvStream* UcbStreamHelper::CreateStream( Reference < XInputStream > xStream, boo
 
 SvStream* UcbStreamHelper::CreateStream( Reference < XStream > xStream, bool bCloseStream )
 {
-    SvStream* pStream = NULL;
+    SvStream* pStream = nullptr;
     if ( xStream->getOutputStream().is() )
     {
         UcbLockBytesRef xLockBytes = UcbLockBytes::CreateLockBytes( xStream );
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index 2f59ebcfc4c0..8a9f952b2785 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.cxx
@@ -31,7 +31,7 @@ OTempFileService::OTempFileService(css::uno::Reference< css::uno::XComponentCont
     context
     , static_cast< Implements >( IMPLEMENTS_PROPERTY_SET | IMPLEMENTS_FAST_PROPERTY_SET | IMPLEMENTS_PROPERTY_ACCESS )
     , com::sun::star::uno::Sequence< OUString >() )
-, mpStream( NULL )
+, mpStream( nullptr )
 , mbRemoveFile( true )
 , mbInClosed( false )
 , mbOutClosed( false )
@@ -74,12 +74,12 @@ throw ()
 css::uno::Sequence< css::uno::Type > SAL_CALL OTempFileService::getTypes(  )
 throw ( css::uno::RuntimeException, std::exception )
 {
-    static ::cppu::OTypeCollection* pTypeCollection = NULL;
-    if ( pTypeCollection == NULL )
+    static ::cppu::OTypeCollection* pTypeCollection = nullptr;
+    if ( pTypeCollection == nullptr )
     {
         ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
 
-        if ( pTypeCollection == NULL )
+        if ( pTypeCollection == nullptr )
         {
             static ::cppu::OTypeCollection aTypeCollection(
                 cppu::UnoType<css::beans::XPropertySet>::get()
@@ -178,7 +178,7 @@ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css
         mnCachedPos = mpStream->Tell();
         mbHasCachedPos = true;
 
-        mpStream = NULL;
+        mpStream = nullptr;
         if ( mpTempFile )
             mpTempFile->CloseStream();
     }
@@ -245,12 +245,12 @@ throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeE
     if ( mbOutClosed )
     {
         // stream will be deleted by TempFile implementation
-        mpStream = NULL;
+        mpStream = nullptr;
 
         if ( mpTempFile )
         {
             delete mpTempFile;
-            mpTempFile = NULL;
+            mpTempFile = nullptr;
         }
     }
 }
@@ -296,7 +296,7 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
         mnCachedPos = mpStream->Tell();
         mbHasCachedPos = true;
 
-        mpStream = NULL;
+        mpStream = nullptr;
         if ( mpTempFile )
             mpTempFile->CloseStream();
     }
@@ -304,12 +304,12 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
     if ( mbInClosed )
     {
         // stream will be deleted by TempFile implementation
-        mpStream = NULL;
+        mpStream = nullptr;
 
         if ( mpTempFile )
         {
             delete mpTempFile;
-            mpTempFile = NULL;
+            mpTempFile = nullptr;
         }
     }
 }
@@ -334,7 +334,7 @@ void OTempFileService::checkConnected ()
             }
             else
             {
-                mpStream = NULL;
+                mpStream = nullptr;
                 mpTempFile->CloseStream();
             }
         }