loplugin:nullptr (automatic rewrite)

Change-Id: I7213b49b09ddcb00841aa5f63343baeab0e65fa4

35 files changed, 268 insertions, 268 deletions

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index c67bc91d2ac3..ee91a5c0c745 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -122,13 +122,13 @@
 using namespace ::com::sun::star;
 
 // Static member
-SfxApplication* SfxApplication::pApp = NULL;
+SfxApplication* SfxApplication::pApp = nullptr;
 #if HAVE_FEATURE_SCRIPTING
-static BasicDLL*       pBasic   = NULL;
+static BasicDLL*       pBasic   = nullptr;
 #endif
 
 #if HAVE_FEATURE_DESKTOP
-static SfxHelp*        pSfxHelp = NULL;
+static SfxHelp*        pSfxHelp = nullptr;
 #endif
 
 namespace
@@ -180,7 +180,7 @@ SfxApplication* SfxApplication::GetOrCreate()
 }
 
 SfxApplication::SfxApplication()
-    : pAppData_Impl( 0 )
+    : pAppData_Impl( nullptr )
 {
     SetName( "StarOffice" );
     if (!utl::ConfigManager::IsAvoidConfig())
@@ -243,7 +243,7 @@ SfxApplication::~SfxApplication()
 #endif
 
     delete pAppData_Impl;
-    pApp = 0;
+    pApp = nullptr;
 }
 
 
@@ -426,7 +426,7 @@ void SfxApplication::ReleaseIndex(sal_uInt16 i)
 vcl::Window* SfxApplication::GetTopWindow() const
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( SfxViewFrame::Current() );
-    return pWork ? pWork->GetWindow() : NULL;
+    return pWork ? pWork->GetWindow() : nullptr;
 }
 
 SfxTbxCtrlFactArr_Impl&     SfxApplication::GetTbxCtrlFactories_Impl() const
@@ -557,11 +557,11 @@ SfxApplication::ChooseScript()
         SAL_INFO( "sfx.appl", "create selector dialog");
 
         const SfxViewFrame* pViewFrame = SfxViewFrame::Current();
-        const SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetFrame() : NULL;
+        const SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetFrame() : nullptr;
         uno::Reference< frame::XFrame > xFrame( pFrame ? pFrame->GetFrameInterface() : uno::Reference< frame::XFrame >() );
 
         std::unique_ptr<AbstractScriptSelectorDialog> pDlg(
-            pFact->CreateScriptSelectorDialog( NULL, false, xFrame ));
+            pFact->CreateScriptSelectorDialog( nullptr, false, xFrame ));
 
         SAL_INFO( "sfx.appl", "done, now exec it");
 
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 085d7885cf03..36f917d1d19d 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -101,7 +101,7 @@ BasicManager* SfxApplication::GetBasicManager()
     return 0;
 #else
     if (utl::ConfigManager::IsAvoidConfig())
-        return 0;
+        return nullptr;
     return BasicManagerRepository::getApplicationBasicManager( true );
 #endif
 }
@@ -112,7 +112,7 @@ XLibraryContainer * SfxApplication::GetDialogContainer()
     return NULL;
 #else
     if (utl::ConfigManager::IsAvoidConfig())
-        return NULL;
+        return nullptr;
     if ( !pAppData_Impl->pBasicManager->isValid() )
         GetBasicManager();
     return pAppData_Impl->pBasicManager->getLibraryContainer( SfxBasicManagerHolder::DIALOGS );
@@ -127,7 +127,7 @@ XLibraryContainer * SfxApplication::GetBasicContainer()
     return NULL;
 #else
     if (utl::ConfigManager::IsAvoidConfig())
-        return NULL;
+        return nullptr;
     if ( !pAppData_Impl->pBasicManager->isValid() )
         GetBasicManager();
     return pAppData_Impl->pBasicManager->getLibraryContainer( SfxBasicManagerHolder::SCRIPTS );
@@ -140,7 +140,7 @@ StarBASIC* SfxApplication::GetBasic()
     return 0;
 #else
     if (utl::ConfigManager::IsAvoidConfig())
-        return 0;
+        return nullptr;
     return GetBasicManager()->GetLib(0);
 #endif
 }
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index 36a5043fdc7c..78e0def08b49 100644
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -39,7 +39,7 @@ using ::osl::Mutex;
 
 
 SfxBasicManagerHolder::SfxBasicManagerHolder()
-    :mpBasicManager( NULL )
+    :mpBasicManager( nullptr )
 {
 }
 
@@ -147,7 +147,7 @@ XLibraryContainer * SfxBasicManagerHolder::getLibraryContainer( ContainerType _e
     case DIALOGS:   return mxDialogContainer.get();
     }
     OSL_FAIL( "SfxBasicManagerHolder::getLibraryContainer: illegal container type!" );
-    return NULL;
+    return nullptr;
 }
 
 void SfxBasicManagerHolder::impl_releaseContainers()
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index de657b3493b9..f88853f32210 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -497,7 +497,7 @@ bool SfxApplication::GetOptions( SfxItemSet& rSet )
 // TODO/CLEANUP: Why two SetOptions Methods?
 void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
 {
-    const SfxPoolItem *pItem = 0;
+    const SfxPoolItem *pItem = nullptr;
     SfxItemPool &rPool = GetPool();
 
     SvtSaveOptions aSaveOptions;
@@ -776,7 +776,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
     SvtPathOptions aPathOptions;
 
     // Data is saved in DocInfo and IniManager
-    const SfxPoolItem *pItem = 0;
+    const SfxPoolItem *pItem = nullptr;
     SfxItemPool &rPool = GetPool();
 
     SfxAllItemSet aSendSet( rSet );
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index f317ad4b0b82..554406f1ef93 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -63,7 +63,7 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, sal_uInt1
         SfxChildWinContextFactory *pFact)
 {
     SfxChildWinFactArr_Impl *pFactories;
-    SfxChildWinFactory *pF = NULL;
+    SfxChildWinFactory *pF = nullptr;
     if ( pMod )
     {
         // Abandon Module, search there for ChildwindowFactory
@@ -140,7 +140,7 @@ SfxWorkWindow* SfxApplication::GetWorkWindow_Impl(const SfxViewFrame *pFrame) co
     else if ( pAppData_Impl->pViewFrame )
         return pAppData_Impl->pViewFrame->GetFrame().GetWorkWindow_Impl();
     else
-        return NULL;
+        return nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 6bd7ac3fab3b..b2635fca95f0 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -78,51 +78,51 @@ SfxBasicManagerCreationListener::~SfxBasicManagerCreationListener()
 
 void SfxBasicManagerCreationListener::onBasicManagerCreated( const Reference< XModel >& _rxForDocument, BasicManager& _rBasicManager )
 {
-    if ( _rxForDocument == NULL )
+    if ( _rxForDocument == nullptr )
         m_rAppData.OnApplicationBasicManagerCreated( _rBasicManager );
 }
 
 SfxAppData_Impl::SfxAppData_Impl( SfxApplication* )
-    : pDdeService( 0 )
-    , pDocTopics( 0 )
-    , pTriggerTopic(0)
-    , pDdeService2(0)
-    , pFactArr(0)
+    : pDdeService( nullptr )
+    , pDocTopics( nullptr )
+    , pTriggerTopic(nullptr)
+    , pDdeService2(nullptr)
+    , pFactArr(nullptr)
     , pTopFrames( new SfxFrameArr_Impl )
-    , pMatcher( 0 )
+    , pMatcher( nullptr )
 #if HAVE_FEATURE_SCRIPTING
-    , pBasicResMgr( 0 )
+    , pBasicResMgr( nullptr )
 #endif
-    , pSvtResMgr( 0 )
-    , m_pToolsErrorHdl(0)
-    , m_pSoErrorHdl(0)
+    , pSvtResMgr( nullptr )
+    , m_pToolsErrorHdl(nullptr)
+    , m_pSoErrorHdl(nullptr)
 #if HAVE_FEATURE_SCRIPTING
-    , m_pSbxErrorHdl(0)
+    , m_pSbxErrorHdl(nullptr)
 #endif
-    , pAppDispatch(NULL)
-    , pTemplates( 0 )
-    , pPool(0)
-    , pSaveOptions( 0 )
-    , pHelpOptions( 0 )
-    , pProgress(0)
+    , pAppDispatch(nullptr)
+    , pTemplates( nullptr )
+    , pPool(nullptr)
+    , pSaveOptions( nullptr )
+    , pHelpOptions( nullptr )
+    , pProgress(nullptr)
     , nDocModalMode(0)
     , nAutoTabPageId(0)
     , nRescheduleLocks(0)
     , nInReschedule(0)
     , m_xImeStatusWindow(new sfx2::appl::ImeStatusWindow(comphelper::getProcessComponentContext()))
-    , pTbxCtrlFac(0)
-    , pStbCtrlFac(0)
-    , pMenuCtrlFac(0)
-    , pViewFrames(0)
-    , pViewShells(0)
-    , pObjShells(0)
-    , pSfxResManager(0)
+    , pTbxCtrlFac(nullptr)
+    , pStbCtrlFac(nullptr)
+    , pMenuCtrlFac(nullptr)
+    , pViewFrames(nullptr)
+    , pViewShells(nullptr)
+    , pObjShells(nullptr)
+    , pSfxResManager(nullptr)
     , pBasicManager( new SfxBasicManagerHolder )
     , pBasMgrListener( new SfxBasicManagerCreationListener( *this ) )
-    , pViewFrame( 0 )
-    , pSlotPool( 0 )
-    , pAppDispat( 0 )
-    , pInterfaces( 0 )
+    , pViewFrame( nullptr )
+    , pSlotPool( nullptr )
+    , pAppDispat( nullptr )
+    , pInterfaces( nullptr )
     , nDocNo(0)
     , nInterfaces( 0 )
     , bDispatcherLocked( false )
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index ae1e1abe2491..62b81f441cb2 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -402,7 +402,7 @@ bool SfxObjectShell::DdeSetData( const OUString&,                    // the Item
 */
 ::sfx2::SvLinkSource* SfxObjectShell::DdeCreateLinkSource( const OUString& ) // the Item to be addressed
 {
-    return 0;
+    return nullptr;
 }
 
 void SfxObjectShell::ReconnectDdeLink(SfxObjectShell& /*rServer*/)
diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx
index 3b62ce56bc3a..11cc76d5bd60 100644
--- a/sfx2/source/appl/appdispatchprovider.cxx
+++ b/sfx2/source/appl/appdispatchprovider.cxx
@@ -135,7 +135,7 @@ Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch(
     sal_uInt16                  nId( 0 );
     bool                bMasterCommand( false );
     Reference < XDispatch > xDisp;
-    const SfxSlot* pSlot = 0;
+    const SfxSlot* pSlot = nullptr;
     SfxDispatcher* pAppDisp = SfxGetpApp()->GetAppDispatcher_Impl();
     if ( aURL.Protocol == "slot:" || aURL.Protocol == "commandId:" )
     {
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 7d7ee7b410fc..720c05c3943f 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -173,7 +173,7 @@ extern "C" bool GetSpecialCharsForEdit( vcl::Window* i_pParent, const vcl::Font&
 OUString GetSpecialCharsForEdit(vcl::Window* pParent, const vcl::Font& rFont)
 {
     static bool bDetermineFunction = false;
-    static PFunc_getSpecialCharsForEdit pfunc_getSpecialCharsForEdit = 0;
+    static PFunc_getSpecialCharsForEdit pfunc_getSpecialCharsForEdit = nullptr;
 
     SolarMutexGuard aGuard;
     if ( !bDetermineFunction )
@@ -276,7 +276,7 @@ bool SfxApplication::Initialize_Impl()
     // App-Dispatcher aufbauen
     pAppData_Impl->pAppDispat->Push(*this);
     pAppData_Impl->pAppDispat->Flush();
-    pAppData_Impl->pAppDispat->DoActivate_Impl( true, NULL );
+    pAppData_Impl->pAppDispat->DoActivate_Impl( true, nullptr );
 
     {
         SolarMutexGuard aGuard;
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index fb4a17b20a9e..04ae901e740d 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -124,13 +124,13 @@ SfxModule* SfxApplication::GetModule_Impl()
 {
     SfxModule* pModule = SfxModule::GetActiveModule();
     if ( !pModule )
-        pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( 0, false ) );
+        pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( nullptr, false ) );
     if( pModule )
         return pModule;
     else
     {
         OSL_FAIL( "No module!" );
-        return NULL;
+        return nullptr;
     }
 }
 
@@ -144,7 +144,7 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid
 
     OUString aBaseName = "/" + OUString::createFromAscii( pName );
 
-    rtl_Locale *pLoc = NULL;
+    rtl_Locale *pLoc = nullptr;
     osl_getProcessLocale (&pLoc);
     LanguageTag aLanguageTag( *pLoc);
 
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 0d1b0f8fbcc6..3119d6df5a3e 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -218,7 +218,7 @@ sal_uInt32 CheckPasswd_Impl
 
                 if ( bIsEncrypted )
                 {
-                    vcl::Window* pWin = pDoc ? pDoc->GetDialogParent( pFile ) : NULL;
+                    vcl::Window* pWin = pDoc ? pDoc->GetDialogParent( pFile ) : nullptr;
                     if ( pWin )
                         pWin->Show();
 
@@ -286,7 +286,7 @@ sal_uInt32 CheckPasswd_Impl
 
 sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUString &rFileName, bool bCopy, SfxItemSet* pSet )
 {
-    const SfxFilter* pFilter = NULL;
+    const SfxFilter* pFilter = nullptr;
     SfxMedium aMedium( rFileName,  ( StreamMode::READ | StreamMode::SHARE_DENYNONE ) );
 
     if ( !aMedium.GetStorage( false ).is() )
@@ -523,7 +523,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
     {
         SfxCallMode eMode = SfxCallMode::SYNCHRON;
 
-        const SfxPoolItem *pRet=0;
+        const SfxPoolItem *pRet=nullptr;
         SfxStringItem aReferer( SID_REFERER, "private:user" );
         SfxStringItem aTarget( SID_TARGETNAME, "_default" );
         if ( !aTemplateFileName.isEmpty() )
@@ -586,7 +586,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         const SfxSlot* pSlot = GetInterface()->GetSlot( aCommand );
         if ( pSlot )
         {
-            pFileNameItem = NULL;
+            pFileNameItem = nullptr;
         }
         else
         {
@@ -594,7 +594,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             {
                 sal_uInt16 nSlotId = (sal_uInt16) aCommand.copy(5).toInt32();
                 if ( nSlotId == SID_OPENDOC )
-                    pFileNameItem = NULL;
+                    pFileNameItem = nullptr;
             }
         }
     }
@@ -604,7 +604,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         // get FileName from dialog
         std::vector<OUString> pURLList;
         OUString aFilter;
-        SfxItemSet* pSet = NULL;
+        SfxItemSet* pSet = nullptr;
         OUString aPath;
         const SfxStringItem* pFolderNameItem = rReq.GetArg<SfxStringItem>(SID_PATH);
         if ( pFolderNameItem )
@@ -901,7 +901,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
                         try
                         {
                             sfx2::openUriExternally(
-                                aURL.Complete, pFilter == 0);
+                                aURL.Complete, pFilter == nullptr);
                         }
                         catch ( css::system::SystemShellExecuteException& )
                         {
@@ -930,7 +930,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         return;
     }
 
-    SfxFrame* pTargetFrame = NULL;
+    SfxFrame* pTargetFrame = nullptr;
     Reference< XFrame > xTargetFrame;
 
     const SfxFrameItem* pFrameItem = rReq.GetArg<SfxFrameItem>(SID_DOCFRAME);
@@ -974,7 +974,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 
         if (!pInteractionItem)
         {
-            Reference < task::XInteractionHandler2 > xHdl = task::InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), 0 );
+            Reference < task::XInteractionHandler2 > xHdl = task::InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), nullptr );
             rReq.AppendItem( SfxUnoAnyItem(SID_INTERACTIONHANDLER,css::uno::makeAny(xHdl)) );
         }
         if (!pMacroExecItem)
@@ -1021,7 +1021,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         aFileName = pURLItem->GetValue();
         if( aFileName.startsWith("#") ) // Mark without URL
         {
-            SfxViewFrame *pView = pTargetFrame ? pTargetFrame->GetCurrentViewFrame() : 0;
+            SfxViewFrame *pView = pTargetFrame ? pTargetFrame->GetCurrentViewFrame() : nullptr;
             if ( !pView )
                 pView = SfxViewFrame::Current();
             pView->GetViewShell()->JumpToMark( aFileName.copy(1) );
@@ -1088,7 +1088,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     if ( xController.is() )
     {
         // try to find the SfxFrame for the controller
-        SfxFrame* pCntrFrame = NULL;
+        SfxFrame* pCntrFrame = nullptr;
         for ( SfxViewShell* pShell = SfxViewShell::GetFirst( false ); pShell; pShell = SfxViewShell::GetNext( *pShell, false ) )
         {
             if ( pShell->GetController() == xController )
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 5e276c398ed4..cc891da5fd8d 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -88,20 +88,20 @@ void SfxApplication::Deinitialize()
     pAppData_Impl->pAppDispat->Pop( *this, SfxDispatcherPopFlags::POP_UNTIL );
     pAppData_Impl->pAppDispat->Flush();
     pAppData_Impl->bDowning = true;
-    pAppData_Impl->pAppDispat->DoDeactivate_Impl( true, NULL );
+    pAppData_Impl->pAppDispat->DoDeactivate_Impl( true, nullptr );
 
     // Release Controller and others
     // then the remaining components should also disappear ( Beamer! )
 
 #if HAVE_FEATURE_SCRIPTING
     BasicManagerRepository::resetApplicationBasicManager();
-    pAppData_Impl->pBasicManager->reset( NULL );
+    pAppData_Impl->pBasicManager->reset( nullptr );
         // this will also delete pBasMgr
 #endif
 
-    DBG_ASSERT( pAppData_Impl->pViewFrame == 0, "active foreign ViewFrame" );
+    DBG_ASSERT( pAppData_Impl->pViewFrame == nullptr, "active foreign ViewFrame" );
 
-    delete[] pAppData_Impl->pInterfaces, pAppData_Impl->pInterfaces = 0;
+    delete[] pAppData_Impl->pInterfaces, pAppData_Impl->pInterfaces = nullptr;
 
     // free administration managers
     DELETEZ(pAppData_Impl->pAppDispat);
@@ -123,7 +123,7 @@ void SfxApplication::Deinitialize()
 
     //TODO/CLEANUP
     //ReleaseArgs could be used instead!
-    pAppData_Impl->pPool = NULL;
+    pAppData_Impl->pPool = nullptr;
     NoChaos::ReleaseItemPool();
 
 #if HAVE_FEATURE_SCRIPTING
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index ee82f244a503..8ba3ca2d928f 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -53,10 +53,10 @@ void SfxApplication::Registrations_Impl()
 
     // ChildWindows
     SfxRecordingFloatWrapper_Impl::RegisterChildWindow();
-    SfxNavigatorWrapper::RegisterChildWindow( false, NULL, SfxChildWindowFlags::NEVERHIDE );
+    SfxNavigatorWrapper::RegisterChildWindow( false, nullptr, SfxChildWindowFlags::NEVERHIDE );
     SfxPartChildWnd_Impl::RegisterChildWindow();
     SfxDockingWrapper::RegisterChildWindow();
-    SfxInfoBarContainerChild::RegisterChildWindow( true, NULL, SfxChildWindowFlags::NEVERHIDE );
+    SfxInfoBarContainerChild::RegisterChildWindow( true, nullptr, SfxChildWindowFlags::NEVERHIDE );
 
     // Controller
     SfxToolBoxControl::RegisterControl(SID_REPEAT);
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index beddf4cba2cf..f5704b0f3fb6 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -170,7 +170,7 @@ namespace
                 xSyncDbusSessionHelper->InstallPackageNames(0, vPackages, sInteraction);
                 // Ill be back (hopefully)!
                 SolarMutexGuard aGuard;
-                executeRestartDialog(comphelper::getProcessComponentContext(), NULL, RESTART_REASON_BIBLIOGRAPHY_INSTALL);
+                executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, RESTART_REASON_BIBLIOGRAPHY_INSTALL);
             }
             catch (const Exception & e)
             {
@@ -244,7 +244,7 @@ namespace
     private:
         DECL_LINK_TYPED(ShowHdl, Button*, void);
     public:
-        explicit LicenseDialog(vcl::Window *pParent=NULL);
+        explicit LicenseDialog(vcl::Window *pParent=nullptr);
     };
 
     LicenseDialog::LicenseDialog(vcl::Window *pParent)
@@ -365,7 +365,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 
                 std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog(
                     RID_SVXDLG_CUSTOMIZE,
-                    NULL, &aSet, xFrame ));
+                    nullptr, &aSet, xFrame ));
 
                 if ( pDlg )
                 {
@@ -471,7 +471,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
             Help* pHelp = Application::GetHelp();
             if ( pHelp )
             {
-                pHelp->Start( ".uno:HelpIndex", NULL ); // show start page
+                pHelp->Start( ".uno:HelpIndex", nullptr ); // show start page
                 bDone = true;
             }
             break;
@@ -533,7 +533,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
             SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
             if ( pFact )
             {
-                std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( 0, RID_DEFAULTABOUT ));
+                std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( nullptr, RID_DEFAULTABOUT ));
                 pDlg->Execute();
                 bDone = true;
             }
@@ -570,11 +570,11 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
             if (sfx2::appl::ImeStatusWindow::canToggle())
             {
                 const SfxBoolItem * pItem = rReq.GetArg<SfxBoolItem>(SID_SHOW_IME_STATUS_WINDOW);
-                bool bShow = pItem == 0
+                bool bShow = pItem == nullptr
                     ? !pAppData_Impl->m_xImeStatusWindow->isShowing()
                     : pItem->GetValue();
                 pAppData_Impl->m_xImeStatusWindow->show(bShow);
-                if (pItem == 0)
+                if (pItem == nullptr)
                     rReq.AppendItem(SfxBoolItem(SID_SHOW_IME_STATUS_WINDOW,
                                                 bShow));
             }
@@ -947,7 +947,7 @@ namespace
         {
                DBG_UNHANDLED_EXCEPTION();
         }
-        return NULL;
+        return nullptr;
     }
 #endif // HAVE_FEATURE_SCRIPTING
 }
@@ -963,7 +963,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             if ( pURLItem )
                 sPageURL = pURLItem->GetValue();
             const SfxItemSet* pArgs = rReq.GetInternalArgs_Impl();
-            const SfxPoolItem* pItem = NULL;
+            const SfxPoolItem* pItem = nullptr;
             Reference < XFrame > xFrame;
             if ( pArgs && pArgs->GetItemState( SID_FILLFRAME, false, &pItem ) == SfxItemState::SET )
             {
@@ -974,7 +974,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             if ( pFact )
             {
                 VclAbstractDialog* pDlg =
-                    pFact->CreateFrameDialog( NULL, xFrame, rReq.GetSlot(), sPageURL );
+                    pFact->CreateFrameDialog( nullptr, xFrame, rReq.GetSlot(), sPageURL );
                 short nRet = pDlg->Execute();
                 delete pDlg;
                 SfxViewFrame* pView = SfxViewFrame::GetFirst();
@@ -1031,7 +1031,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
 #if HAVE_FEATURE_SCRIPTING
         case SID_BASICIDE_APPEAR:
         {
-            SfxViewFrame* pView = lcl_getBasicIDEViewFrame( NULL );
+            SfxViewFrame* pView = lcl_getBasicIDEViewFrame( nullptr );
             if ( !pView )
             {
                 SfxObjectShell* pBasicIDE = SfxObjectShell::CreateObject( lcl_getBasicIDEServiceName() );
@@ -1237,13 +1237,13 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             if ( pFact )
             {
                 SfxItemSet aSet(GetPool(), SID_AUTO_CORRECT_DLG, SID_AUTO_CORRECT_DLG);
-                const SfxPoolItem* pItem=NULL;
+                const SfxPoolItem* pItem=nullptr;
                 const SfxItemSet* pSet = rReq.GetArgs();
-                SfxItemPool* pSetPool = pSet ? pSet->GetPool() : NULL;
+                SfxItemPool* pSetPool = pSet ? pSet->GetPool() : nullptr;
                 if ( pSet && pSet->GetItemState( pSetPool->GetWhich( SID_AUTO_CORRECT_DLG ), false, &pItem ) == SfxItemState::SET )
                     aSet.Put( *pItem );
 
-                std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog( RID_OFA_AUTOCORR_DLG, NULL, &aSet, NULL ));
+                std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog( RID_OFA_AUTOCORR_DLG, nullptr, &aSet, nullptr ));
                 pDlg->Execute();
             }
 
@@ -1302,7 +1302,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             {
                 Reference< uno::XComponentContext > xORB = ::comphelper::getProcessComponentContext();
                 Reference< ui::dialogs::XExecutableDialog > xDialog;
-                xDialog = ui::dialogs::AddressBookSourcePilot::createWithParent(xORB, 0);
+                xDialog = ui::dialogs::AddressBookSourcePilot::createWithParent(xORB, nullptr);
                 xDialog->execute();
             }
             catch(const css::uno::Exception&)
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 0bea0bdfd733..eb4264a07512 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1373,7 +1373,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
          nSlotId == SID_SAVETO || nSlotId == SID_EXPORTDOCASPDF || nSlotId == SID_DIRECTEXPORTDOCASPDF ||
          nSlotId == SID_SAVEACOPY )
     {
-        const SfxPoolItem *pItem=0;
+        const SfxPoolItem *pItem=nullptr;
         if ( rSet.GetItemState( SID_COMPONENTDATA, false, &pItem ) == SfxItemState::SET )
         {
             pValue[nActProp].Name = sComponentData;
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 05c80c279a58..c576ad6e66d9 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -46,7 +46,7 @@ SfxChildWinFactory::SfxChildWinFactory( SfxChildWinCtor pTheCtor, sal_uInt16 nID
     : pCtor(pTheCtor)
     , nId( nID )
     , nPos(n)
-    , pArr( NULL )
+    , pArr( nullptr )
 {}
 
 SfxChildWinFactory::~SfxChildWinFactory()
@@ -101,8 +101,8 @@ class DisposeListener : public ::cppu::WeakImplHelper< css::lang::XEventListener
                     delete m_pOwner;
                 }
 
-                m_pOwner = NULL;
-                m_pData  = NULL;
+                m_pOwner = nullptr;
+                m_pData  = nullptr;
             }
         }
 
@@ -162,15 +162,15 @@ SfxChildWindow::SfxChildWindow(vcl::Window *pParentWindow, sal_uInt16 nId)
     , eChildAlignment(SfxChildAlignment::NOALIGNMENT)
 {
     pImp = new SfxChildWindow_Impl;
-    pImp->pFact = 0L;
+    pImp->pFact = nullptr;
     pImp->bHideNotDelete = false;
     pImp->bHideAtToggle = false;
     pImp->bWantsFocus = true;
     pImp->bVisible = true;
-    pImp->pContextModule = NULL;
-    pImp->pWorkWin = NULL;
+    pImp->pContextModule = nullptr;
+    pImp->pWorkWin = nullptr;
 
-    pContext = 0L;
+    pContext = nullptr;
 }
 
 void SfxChildWindow::Destroy()
@@ -199,27 +199,27 @@ void SfxChildWindow::ClearWorkwin()
     if (pImp->pWorkWin)
     {
         if (pImp->pWorkWin->GetActiveChild_Impl() == pWindow)
-            pImp->pWorkWin->SetActiveChild_Impl(NULL);
-        pImp->pWorkWin = NULL;
+            pImp->pWorkWin->SetActiveChild_Impl(nullptr);
+        pImp->pWorkWin = nullptr;
     }
 }
 
 SfxChildWindow::~SfxChildWindow()
 {
     delete pContext;
-    pContext = NULL;
+    pContext = nullptr;
     ClearWorkwin();
     pWindow.disposeAndClear();
     delete pImp;
-    pImp = NULL;
+    pImp = nullptr;
 }
 
 
 SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId,
         vcl::Window *pParent, SfxBindings* pBindings, SfxChildWinInfo& rInfo)
 {
-    SfxChildWindow *pChild=0;
-    SfxChildWinFactory* pFact=0;
+    SfxChildWindow *pChild=nullptr;
+    SfxChildWinFactory* pFact=nullptr;
     SystemWindowFlags nOldMode = Application::GetSystemWindowMode();
 
     // First search for ChildWindow in SDT; Overlay windows are realized
@@ -250,8 +250,8 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId,
         }
     }
 
-    SfxDispatcher *pDisp = pBindings ? pBindings->GetDispatcher_Impl() : NULL;
-    SfxModule *pMod = pDisp ? SfxModule::GetActiveModule( pDisp->GetFrame() ) : NULL;
+    SfxDispatcher *pDisp = pBindings ? pBindings->GetDispatcher_Impl() : nullptr;
+    SfxModule *pMod = pDisp ? SfxModule::GetActiveModule( pDisp->GetFrame() ) : nullptr;
     if (!pChild && pMod)
     {
         SfxChildWinFactArr_Impl *pFactories = pMod->GetChildWinFactories_Impl();
@@ -438,11 +438,11 @@ void SfxChildWindow::InitializeChildWinFactory_Impl(sal_uInt16 nId, SfxChildWinI
 
 void SfxChildWindow::CreateContext( sal_uInt16 nContextId, SfxBindings& rBindings )
 {
-    SfxChildWindowContext *pCon = NULL;
-    SfxChildWinFactory* pFact=0;
+    SfxChildWindowContext *pCon = nullptr;
+    SfxChildWinFactory* pFact=nullptr;
     SfxApplication *pApp = SfxGetpApp();
     SfxDispatcher *pDisp = rBindings.GetDispatcher_Impl();
-    SfxModule *pMod = pDisp ? SfxModule::GetActiveModule( pDisp->GetFrame() ) :0;
+    SfxModule *pMod = pDisp ? SfxModule::GetActiveModule( pDisp->GetFrame() ) :nullptr;
     if ( pMod )
     {
         SfxChildWinFactArr_Impl *pFactories = pMod->GetChildWinFactories_Impl();
@@ -498,7 +498,7 @@ void SfxChildWindow::CreateContext( sal_uInt16 nContextId, SfxBindings& rBinding
                         SfxChildWinInfo aInfo = pFact->aInfo;
                         pCon = pConFact->pCtor( GetWindow(), &rBindings, &aInfo );
                         pCon->nContextId = pConFact->nContextId;
-                        pImp->pContextModule = NULL;
+                        pImp->pContextModule = nullptr;
                     }
                     rBindings.LEAVEREGISTRATIONS();
                 }
@@ -544,7 +544,7 @@ FloatingWindow* SfxChildWindowContext::GetFloatingWindow() const
     else
     {
         OSL_FAIL("No FloatingWindow-Context!");
-        return NULL;
+        return nullptr;
     }
 }
 
@@ -692,7 +692,7 @@ void SfxChildWindow::Show( ShowFlags nFlags )
 
 vcl::Window* SfxChildWindow::GetContextWindow( SfxModule *pModule ) const
 {
-    return pModule == pImp->pContextModule && pContext ? pContext->GetWindow(): 0;
+    return pModule == pImp->pContextModule && pContext ? pContext->GetWindow(): nullptr;
 }
 
 void SfxChildWindow::SetWorkWindow_Impl( SfxWorkWindow* pWin )
@@ -704,7 +704,7 @@ void SfxChildWindow::SetWorkWindow_Impl( SfxWorkWindow* pWin )
 
 void SfxChildWindow::Activate_Impl()
 {
-    if(pImp->pWorkWin!=NULL)
+    if(pImp->pWorkWin!=nullptr)
         pImp->pWorkWin->SetActiveChild_Impl( pWindow );
 }
 
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index b639131dcec1..e65276830c0a 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -47,9 +47,9 @@
 #define FILETYPE_OBJECT     3
 
 SvFileObject::SvFileObject()
-    : nPostUserEventId(0)
+    : nPostUserEventId(nullptr)
     , mxDelMed()
-    , pOldParent(NULL)
+    , pOldParent(nullptr)
     , nType(FILETYPE_TEXT)
     , bLoadAgain(true)
     , bSynchron(false)
@@ -134,7 +134,7 @@ bool SvFileObject::GetData( css::uno::Any & rData,
                     bLoadError = !GetGraphic_Impl( aGrf, xMed->GetInStream() );
                 }
                 else if( !LoadFile_Impl() ||
-                        !GetGraphic_Impl( aGrf, xMed.Is() ? xMed->GetInStream() : 0 ))
+                        !GetGraphic_Impl( aGrf, xMed.Is() ? xMed->GetInStream() : nullptr ))
                 {
                     if( !xMed.Is() )
                         break;
@@ -204,7 +204,7 @@ bool SvFileObject::Connect( sfx2::SvBaseLink* pLink )
         return false;
 
     // Test if not another link of the same connection already exists
-    sfx2::LinkManager::GetDisplayNames( pLink, 0, &sFileNm, 0, &sFilter );
+    sfx2::LinkManager::GetDisplayNames( pLink, nullptr, &sFileNm, nullptr, &sFilter );
 
     if( OBJECT_CLIENT_GRF == pLink->GetObjType() )
     {
@@ -396,7 +396,7 @@ void SvFileObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pLink, const Li
     OUString sFile, sRange, sTmpFilter;
     if( pLink && pLink->GetLinkManager() )
     {
-        sfx2::LinkManager::GetDisplayNames( pLink, 0, &sFile, &sRange, &sTmpFilter );
+        sfx2::LinkManager::GetDisplayNames( pLink, nullptr, &sFile, &sRange, &sTmpFilter );
 
         switch( pLink->GetObjType() )
         {
@@ -493,7 +493,7 @@ IMPL_LINK_NOARG_TYPED( SvFileObject, LoadGrfReady_Impl, void*, void )
 
 IMPL_LINK_NOARG_TYPED( SvFileObject, DelMedium_Impl, void*, void )
 {
-    nPostUserEventId = 0;
+    nPostUserEventId = nullptr;
     mxDelMed.Clear();
 }
 
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index cc32b9477200..a84126f06017 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -50,7 +50,7 @@ class SvFileObject : public sfx2::SvLinkSource
     bool bStateChangeCalled : 1;
     bool bInCallDownload : 1;
 
-    bool GetGraphic_Impl( Graphic&, SvStream* pStream = 0 );
+    bool GetGraphic_Impl( Graphic&, SvStream* pStream = nullptr );
     bool LoadFile_Impl();
     void SendStateChg_Impl( sfx2::LinkManager::LinkState nState );
 
diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx
index 562ec966b8c6..473343dd2628 100644
--- a/sfx2/source/appl/fwkhelper.cxx
+++ b/sfx2/source/appl/fwkhelper.cxx
@@ -35,7 +35,7 @@ void SAL_CALL RefreshToolbars( css::uno::Reference< css::frame::XFrame >& xFrame
     SolarMutexGuard aGuard;
     if ( xFrame.is() )
     {
-        SfxFrame* pFrame=0;
+        SfxFrame* pFrame=nullptr;
         for ( pFrame = SfxFrame::GetFirst(); pFrame; pFrame = SfxFrame::GetNext( *pFrame ) )
         {
             if ( pFrame->GetFrameInterface() == xFrame )
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index b25d28b4cd86..db7d2831b90a 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -38,8 +38,8 @@ using namespace ::com::sun::star::lang;
 
 HelpInterceptor_Impl::HelpInterceptor_Impl() :
 
-    m_pHistory  ( NULL ),
-    m_pWindow  ( NULL ),
+    m_pHistory  ( nullptr ),
+    m_pWindow  ( nullptr ),
     m_nCurPos   ( 0 )
 
 {
@@ -278,7 +278,7 @@ void SAL_CALL HelpInterceptor_Impl::addStatusListener(
 void SAL_CALL HelpInterceptor_Impl::removeStatusListener(
     const Reference< XStatusListener >&, const URL&) throw( RuntimeException, std::exception )
 {
-    m_xListener = 0;
+    m_xListener = nullptr;
 }
 
 // HelpListener_Impl -----------------------------------------------------
@@ -305,7 +305,7 @@ void SAL_CALL HelpListener_Impl::disposing( const css::lang::EventObject& )
     throw( css::uno::RuntimeException, std::exception )
 {
     pInterceptor->removeStatusListener( this, css::util::URL() );
-    pInterceptor = NULL;
+    pInterceptor = nullptr;
 }
 
 HelpStatusListener_Impl::HelpStatusListener_Impl(
@@ -329,7 +329,7 @@ void HelpStatusListener_Impl::statusChanged(
 void HelpStatusListener_Impl::disposing( const EventObject& ) throw( RuntimeException, std::exception )
 {
     xDispatch->removeStatusListener(this, css::util::URL());
-    xDispatch = 0;
+    xDispatch = nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 40ca5e78f6f5..9d38ad5930e2 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -79,7 +79,7 @@ Image SAL_CALL GetImage(
     if ( nProtocol == INetProtocol::Slot )
     {
         sal_uInt16 nId = ( sal_uInt16 ) aURL.copy(5).toInt32();
-        const SfxSlot* pSlot = 0;
+        const SfxSlot* pSlot = nullptr;
         if ( xModel.is() )
         {
             Reference < XUnoTunnel > xObj( xModel, UNO_QUERY );
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index fdf1369a725e..cc9d4a647c45 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -171,7 +171,7 @@ void SAL_CALL ImeStatusWindow::disposing(css::lang::EventObject const & )
     throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
-    m_xConfig = 0;
+    m_xConfig = nullptr;
     m_bDisposed = true;
 }
 
@@ -198,7 +198,7 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig()
             if (!m_xContext.is())
                 throw css::uno::RuntimeException(
                     OUString("null comphelper::getProcessServiceFactory"),
-                    0);
+                    nullptr);
             css::uno::Reference< css::lang::XMultiServiceFactory > xProvider =
                 css::configuration::theDefaultProvider::get( m_xContext );
             css::beans::PropertyValue aArg(
@@ -219,7 +219,7 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig()
                     OUString(
                                       "null com.sun.star.configuration."
                                       "ConfigurationUpdateAccess"),
-                    0);
+                    nullptr);
             bAdd = true;
         }
         xConfig = m_xConfig;
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index cafabcd29e19..78218a912ccf 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -121,7 +121,7 @@ IMPL_LINK_NOARG_TYPED( SvDDELinkEditDialog, EditHdl_Impl, Edit&, void)
 }
 
 SvDDEObject::SvDDEObject()
-    : pConnection( 0 ), pLink( 0 ), pRequest( 0 ), pGetData( 0 ), nError( 0 )
+    : pConnection( nullptr ), pLink( nullptr ), pRequest( nullptr ), pGetData( nullptr ), nError( 0 )
 {
     SetUpdateTimeout( 100 );
     bWaitForData = sal_False;
@@ -344,7 +344,7 @@ IMPL_LINK_TYPED( SvDDEObject, ImplGetDDEData, const DdeData*, pData, void )
             if( pGetData )
             {
                 *pGetData <<= aSeq;  // Copy Data
-                pGetData = 0;        // reset the pointer here
+                pGetData = nullptr;        // reset the pointer here
             }
             else
             {
@@ -362,7 +362,7 @@ IMPL_LINK_TYPED( SvDDEObject, ImplDoneDDEData, bool, bValid, void )
 {
     if( !bValid && ( pRequest || pLink ))
     {
-        DdeTransaction* pReq = 0;
+        DdeTransaction* pReq = nullptr;
         if( !pLink || ( pLink && pLink->IsBusy() ))
             pReq = pRequest;  // only the one that is ready
         else if( pRequest && pRequest->IsBusy() )
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index ecd5efe9c2d6..74ef914677f8 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -78,7 +78,7 @@ LinkManager::~LinkManager()
         if( rTmp.Is() )
         {
             rTmp->Disconnect();
-            rTmp->SetLinkManager( NULL );
+            rTmp->SetLinkManager( nullptr );
         }
     }
 }
@@ -114,7 +114,7 @@ void LinkManager::Remove( SvBaseLink *pLink )
         if( pLink == rTmp.get() )
         {
             rTmp->Disconnect();
-            rTmp->SetLinkManager( NULL );
+            rTmp->SetLinkManager( nullptr );
             rTmp.Clear();
             bFound = true;
         }
@@ -145,7 +145,7 @@ void LinkManager::Remove( size_t nPos, size_t nCnt )
             if( rTmp.Is() )
             {
                 rTmp->Disconnect();
-                rTmp->SetLinkManager( NULL );
+                rTmp->SetLinkManager( nullptr );
             }
         }
         aLinkTbl.erase( aLinkTbl.begin() + nPos, aLinkTbl.begin() + nPos + nCnt );
@@ -487,9 +487,9 @@ void LinkManager::CancelTransfers()
 
     const sfx2::SvBaseLinks& rLnks = GetLinks();
     for( size_t n = rLnks.size(); n; )
-        if( 0 != ( pLnk = &(*rLnks[ --n ])) &&
+        if( nullptr != ( pLnk = &(*rLnks[ --n ])) &&
             OBJECT_CLIENT_FILE == (OBJECT_CLIENT_FILE & pLnk->GetObjType()) &&
-            0 != ( pFileObj = static_cast<SvFileObject*>(pLnk->GetObj()) ) )
+            nullptr != ( pFileObj = static_cast<SvFileObject*>(pLnk->GetObj()) ) )
             pFileObj->CancelTransfers();
 }
     // For the purpose of sending Status information from the file object to
@@ -568,11 +568,11 @@ OUString lcl_DDE_RelToAbs( const OUString& rTopic, const OUString& rBaseURL )
 
 bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
 {
-    SfxObjectShell* pFndShell = 0;
+    SfxObjectShell* pFndShell = nullptr;
     sal_uInt16 nUpdateMode = css::document::UpdateDocMode::NO_UPDATE;
     OUString sTopic, sItem, sReferer;
     LinkManager* pLinkMgr = pLink->GetLinkManager();
-    if (pLinkMgr && sfx2::LinkManager::GetDisplayNames(pLink, 0, &sTopic, &sItem) && !sTopic.isEmpty())
+    if (pLinkMgr && sfx2::LinkManager::GetDisplayNames(pLink, nullptr, &sTopic, &sItem) && !sTopic.isEmpty())
     {
         // first only loop over the DocumentShells the shells and find those
         // with the name:
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 4bcabbe78b17..66f1290a5afd 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -132,7 +132,7 @@ public:
     explicit SvLinkSource_EntryIter_Impl( const SvLinkSource_Array_Impl& rArr );
     ~SvLinkSource_EntryIter_Impl();
     SvLinkSource_Entry_Impl* Curr()
-                            { return nPos < aArr.size() ? aArr[ nPos ] : 0; }
+                            { return nPos < aArr.size() ? aArr[ nPos ] : nullptr; }
     SvLinkSource_Entry_Impl* Next();
     bool IsValidCurrValue( SvLinkSource_Entry_Impl* pEntry );
 };
@@ -155,7 +155,7 @@ bool SvLinkSource_EntryIter_Impl::IsValidCurrValue( SvLinkSource_Entry_Impl* pEn
 
 SvLinkSource_Entry_Impl* SvLinkSource_EntryIter_Impl::Next()
 {
-    SvLinkSource_Entry_Impl* pRet = 0;
+    SvLinkSource_Entry_Impl* pRet = nullptr;
     if( nPos + 1 < (sal_uInt16)aArr.size() )
     {
         ++nPos;
@@ -169,12 +169,12 @@ SvLinkSource_Entry_Impl* SvLinkSource_EntryIter_Impl::Next()
                 pRet = aArr[ nPos ];
                 if( std::find(rOrigArr.cbegin(), rOrigArr.cend(), pRet ) != rOrigArr.cend() )
                     break;
-                pRet = 0;
+                pRet = nullptr;
                 ++nPos;
             } while( nPos < aArr.size() );
 
             if( nPos >= aArr.size() )
-                pRet = 0;
+                pRet = nullptr;
         }
     }
     return pRet;
@@ -191,7 +191,7 @@ struct SvLinkSource_Impl
     bool               m_bIsReadOnly;
 
     SvLinkSource_Impl()
-        : pTimer(0)
+        : pTimer(nullptr)
         , nTimeout(3000)
         , m_bIsReadOnly(false)
     {
@@ -285,7 +285,7 @@ void SvLinkSource::SendDataChanged()
     if( pImpl->pTimer )
     {
         delete pImpl->pTimer;
-        pImpl->pTimer = NULL;
+        pImpl->pTimer = nullptr;
     }
     pImpl->aDataMimeType.clear();
 }
@@ -319,7 +319,7 @@ void SvLinkSource::NotifyDataChanged()
         if( pImpl->pTimer )
         {
             delete pImpl->pTimer;
-            pImpl->pTimer = NULL;
+            pImpl->pTimer = nullptr;
         }
     }
 }
@@ -357,7 +357,7 @@ void SvLinkSource::DataChanged( const OUString & rMimeType,
         if( pImpl->pTimer )
         {
             delete pImpl->pTimer;
-            pImpl->pTimer = NULL;
+            pImpl->pTimer = nullptr;
         }
     }
 }
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 8b63ebcb6584..63b3a73291f5 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -51,9 +51,9 @@ struct BaseLink_Impl
     bool                m_bIsConnect;
 
     BaseLink_Impl() :
-          m_pLinkMgr( NULL )
-        , m_pParentWin( NULL )
-        , m_pFileDlg( NULL )
+          m_pLinkMgr( nullptr )
+        , m_pParentWin( nullptr )
+        , m_pFileDlg( nullptr )
         , m_bIsConnect( false )
         {}
 
@@ -87,7 +87,7 @@ struct ImplBaseLinkData
         ClientType.nCntntType = SotClipboardFormatId::NONE;
         ClientType.bIntrnlLnk = false;
         ClientType.nUpdateMode = SfxLinkUpdateMode::NONE;
-        DDEType.pItem = NULL;
+        DDEType.pItem = nullptr;
     }
 };
 
@@ -596,7 +596,7 @@ DdeData* ImplDdeItem::Get( SotClipboardFormatId nFormat )
     }
     aSeq.realloc( 0 );
     bIsValidData = false;
-    return 0;
+    return nullptr;
 }
 
 
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx
index 05130baef28a..6e035830dd2d 100644
--- a/sfx2/source/appl/macroloader.cxx
+++ b/sfx2/source/appl/macroloader.cxx
@@ -80,11 +80,11 @@ css::uno::Sequence<OUString> SAL_CALL SfxMacroLoader::getSupportedServiceNames()
 
 SfxObjectShell* SfxMacroLoader::GetObjectShell_Impl()
 {
-    SfxObjectShell* pDocShell = NULL;
+    SfxObjectShell* pDocShell = nullptr;
     Reference < XFrame > xFrame( m_xFrame.get(), UNO_QUERY );
     if ( xFrame.is() )
     {
-        SfxFrame* pFrame=0;
+        SfxFrame* pFrame=nullptr;
         for ( pFrame = SfxFrame::GetFirst(); pFrame; pFrame = SfxFrame::GetNext( *pFrame ) )
         {
             if ( pFrame->GetFrameInterface() == xFrame )
@@ -209,14 +209,14 @@ ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, css::uno::Any& rRetval,
     sal_Int32 nHashPos = aMacro.indexOf( '/', 8 );
     sal_Int32 nArgsPos = aMacro.indexOf( '(' );
     BasicManager *pAppMgr = SfxApplication::GetBasicManager();
-    BasicManager *pBasMgr = 0;
+    BasicManager *pBasMgr = nullptr;
     ErrCode nErr = ERRCODE_NONE;
 
     // should a macro function be executed ( no direct API call)?
     if ( -1 != nHashPos && ( -1 == nArgsPos || nHashPos < nArgsPos ) )
     {
         // find BasicManager
-        SfxObjectShell* pDoc = NULL;
+        SfxObjectShell* pDoc = nullptr;
         OUString aBasMgrName( INetURLObject::decode(aMacro.copy( 8, nHashPos-8 ), INetURLObject::DECODE_WITH_CHARSET) );
         if ( aBasMgrName.isEmpty() )
             pBasMgr = pAppMgr;
@@ -266,8 +266,8 @@ ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, css::uno::Any& rRetval,
             if ( pBasMgr->HasMacro( aQualifiedMethod ) )
             {
                 Any aOldThisComponent;
-                const bool bSetDocMacroMode = ( pDoc != NULL ) && bIsDocBasic;
-                const bool bSetGlobalThisComponent = ( pDoc != NULL ) && bIsAppBasic;
+                const bool bSetDocMacroMode = ( pDoc != nullptr ) && bIsDocBasic;
+                const bool bSetGlobalThisComponent = ( pDoc != nullptr ) && bIsAppBasic;
                 if ( bSetDocMacroMode )
                 {
                     // mark document: it executes an own macro, so it's in a modal mode
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index b0fbd49f777e..e226227ef448 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -78,7 +78,7 @@ public:
     }
 };
 
-static SfxModuleArr_Impl* pModules=0;
+static SfxModuleArr_Impl* pModules=nullptr;
 
 class SfxModule_Impl
 {
@@ -98,7 +98,7 @@ public:
 };
 
 SfxModule_Impl::SfxModule_Impl()
- : pSlotPool(0), pTbxCtrlFac(0), pStbCtrlFac(0), pMenuCtrlFac(0), pFactArr(0), pImgListSmall(0), pImgListBig(0)
+ : pSlotPool(nullptr), pTbxCtrlFac(nullptr), pStbCtrlFac(nullptr), pMenuCtrlFac(nullptr), pFactArr(nullptr), pImgListSmall(nullptr), pImgListBig(nullptr)
 {
 }
 
@@ -143,7 +143,7 @@ ResMgr* SfxModule::GetResMgr()
 
 SfxModule::SfxModule( ResMgr* pMgrP, bool bDummyP,
                       SfxObjectFactory* pFactoryP, ... )
-    : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L)
+    : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(nullptr)
 {
     Construct_Impl();
     va_list pVarArgs;
@@ -165,12 +165,12 @@ void SfxModule::Construct_Impl()
         pImpl = new SfxModule_Impl;
         pImpl->pSlotPool = new SfxSlotPool(&pApp->GetAppSlotPool_Impl());
 
-        pImpl->pTbxCtrlFac=0;
-        pImpl->pStbCtrlFac=0;
-        pImpl->pMenuCtrlFac=0;
-        pImpl->pFactArr=0;
-        pImpl->pImgListSmall=0;
-        pImpl->pImgListBig=0;
+        pImpl->pTbxCtrlFac=nullptr;
+        pImpl->pStbCtrlFac=nullptr;
+        pImpl->pMenuCtrlFac=nullptr;
+        pImpl->pFactArr=nullptr;
+        pImpl->pImgListSmall=nullptr;
+        pImpl->pImgListBig=nullptr;
 
         SetPool( &pApp->GetPool() );
     }
@@ -353,7 +353,7 @@ void SfxModule::DestroyModules_Impl()
             SfxModule* pMod = rModules[nPos];
             delete pMod;
         }
-        delete pModules, pModules = 0;
+        delete pModules, pModules = nullptr;
     }
 }
 
@@ -379,10 +379,10 @@ SfxModule* SfxModule::GetActiveModule( SfxViewFrame* pFrame )
 {
     if ( !pFrame )
         pFrame = SfxViewFrame::Current();
-    SfxObjectShell* pSh = 0;
+    SfxObjectShell* pSh = nullptr;
     if( pFrame )
         pSh = pFrame->GetObjectShell();
-    return pSh ? pSh->GetModule() : 0;
+    return pSh ? pSh->GetModule() : nullptr;
 }
 
 FieldUnit SfxModule::GetModuleFieldUnit( css::uno::Reference< css::frame::XFrame > const & i_frame )
@@ -391,17 +391,17 @@ FieldUnit SfxModule::GetModuleFieldUnit( css::uno::Reference< css::frame::XFrame
 
     // find SfxViewFrame for the given XFrame
     SfxViewFrame* pViewFrame = SfxViewFrame::GetFirst();
-    while ( pViewFrame != NULL )
+    while ( pViewFrame != nullptr )
     {
         if ( pViewFrame->GetFrame().GetFrameInterface() == i_frame )
             break;
         pViewFrame = SfxViewFrame::GetNext( *pViewFrame );
     }
-    ENSURE_OR_RETURN( pViewFrame != NULL, "SfxModule::GetModuleFieldUnit: unable to find an SfxViewFrame for the given XFrame", FUNIT_100TH_MM );
+    ENSURE_OR_RETURN( pViewFrame != nullptr, "SfxModule::GetModuleFieldUnit: unable to find an SfxViewFrame for the given XFrame", FUNIT_100TH_MM );
 
     // find the module
     SfxModule const * pModule = GetActiveModule( pViewFrame );
-    ENSURE_OR_RETURN( pModule != NULL, "SfxModule::GetModuleFieldUnit: no SfxModule for the given frame!", FUNIT_100TH_MM );
+    ENSURE_OR_RETURN( pModule != nullptr, "SfxModule::GetModuleFieldUnit: no SfxModule for the given frame!", FUNIT_100TH_MM );
     return pModule->GetFieldUnit();
 }
 
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index f916c92dc364..d6eabd4ea63a 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -332,7 +332,7 @@ void ContentListBox_Impl::InitRoot()
         OUString aURL = aRow.getToken( 0, '\t', nIdx );
         sal_Unicode cFolder = aRow.getToken( 0, '\t', nIdx )[0];
         bool bIsFolder = ( '1' == cFolder );
-        SvTreeListEntry* pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, NULL, true );
+        SvTreeListEntry* pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, nullptr, true );
         if ( bIsFolder )
             pEntry->SetUserData( new ContentEntry_Impl( aURL, true ) );
     }
@@ -373,7 +373,7 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent )
                     OUString aURL = aRow.getToken( 0, '\t', nIdx );
                     sal_Unicode cFolder = aRow.getToken( 0, '\t', nIdx )[0];
                     bool bIsFolder = ( '1' == cFolder );
-                    SvTreeListEntry* pEntry = NULL;
+                    SvTreeListEntry* pEntry = nullptr;
                     if ( bIsFolder )
                     {
                         pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, pParent, true );
@@ -405,7 +405,7 @@ bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt )
     if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT &&
          KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() )
     {
-        GetDoubleClickHdl().Call( NULL );
+        GetDoubleClickHdl().Call( nullptr );
         bHandled = true;
     }
 
@@ -887,7 +887,7 @@ bool SearchBox_Impl::PreNotify( NotifyEvent& rNEvt )
          rNEvt.GetType() == MouseNotifyEvent::KEYINPUT &&
          KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() )
     {
-        aSearchLink.Call( NULL );
+        aSearchLink.Call( nullptr );
         bHandled = true;
     }
     return bHandled || ComboBox::PreNotify( rNEvt );
@@ -898,7 +898,7 @@ bool SearchBox_Impl::PreNotify( NotifyEvent& rNEvt )
 void SearchBox_Impl::Select()
 {
     if ( !IsTravelSelect() )
-        aSearchLink.Call( NULL );
+        aSearchLink.Call( nullptr );
 }
 
 // class SearchResultsBox_Impl -------------------------------------------
@@ -1042,7 +1042,7 @@ void SearchTabPage_Impl::RememberSearchText( const OUString& rSearchText )
 
 IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, ClickHdl, Button*, void)
 {
-    SearchHdl(NULL);
+    SearchHdl(nullptr);
 }
 
 IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, SearchHdl, LinkParamNone*, void)
@@ -1135,12 +1135,12 @@ bool SearchTabPage_Impl::OpenKeyword( const OUString& rKeyword )
 {
     bool bRet = false;
     m_pSearchED->SetText( rKeyword );
-    SearchHdl( NULL );
+    SearchHdl( nullptr );
     if ( m_pResultsLB->GetEntryCount() > 0 )
     {
         // found keyword -> open it
         m_pResultsLB->SelectEntryPos(0);
-        OpenHdl( NULL );
+        OpenHdl( nullptr );
         bRet = true;
     }
 
@@ -1439,10 +1439,10 @@ SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl(SfxHelpWindow_Impl* _pParent)
     : Window(_pParent, 0)
     , aIndexKeywordLink(LINK(this, SfxHelpIndexWindow_Impl, KeywordHdl))
     , pParentWin(_pParent)
-    , pCPage(NULL)
-    , pIPage(NULL)
-    , pSPage(NULL)
-    , pBPage(NULL)
+    , pCPage(nullptr)
+    , pIPage(nullptr)
+    , pSPage(nullptr)
+    , pBPage(nullptr)
     , bWasCursorLeftOrRight(false)
     , bIsInitDone(false)
 {
@@ -1531,7 +1531,7 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory()
     if ( !bIsInitDone && !m_pActiveLB->GetEntryCount() )
     {
         aIdle.Stop();
-        InitHdl( NULL );
+        InitHdl( nullptr );
     }
 
     for ( sal_Int32 i = 0; i < m_pActiveLB->GetEntryCount(); ++i )
@@ -1543,7 +1543,7 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory()
             if ( m_pActiveLB->GetSelectEntryPos() != i )
             {
                 m_pActiveLB->SelectEntryPos(i);
-                aSelectFactoryLink.Call( NULL );
+                aSelectFactoryLink.Call( nullptr );
             }
             break;
         }
@@ -1555,7 +1555,7 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory()
 HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( sal_uInt16& rCurId )
 {
     rCurId = m_pTabCtrl->GetCurPageId();
-    HelpTabPage_Impl* pPage = NULL;
+    HelpTabPage_Impl* pPage = nullptr;
 
     OString sName(m_pTabCtrl->GetPageName(rCurId));
 
@@ -1901,7 +1901,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
     aOnStartupText      ( SfxResId( RID_HELP_ONSTARTUP_TEXT ).toString() ),
     pHelpWin            ( pParent ),
     pTextWin            ( VclPtr<TextWin_Impl>::Create( this ) ),
-    pSrchDlg            ( NULL ),
+    pSrchDlg            ( nullptr ),
     nMinPos             ( 0 ),
     bIsDebug            ( false ),
     bIsIndexOn          ( false ),
@@ -2261,7 +2261,7 @@ IMPL_LINK_TYPED( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog&, rDlg, voi
 }
 void SfxHelpTextWindow_Impl::FindHdl(sfx2::SearchDialog* pDlg)
 {
-    bool bWrapAround = ( NULL == pDlg );
+    bool bWrapAround = ( nullptr == pDlg );
     if ( bWrapAround )
         pDlg = pSrchDlg;
     DBG_ASSERT( pDlg, "invalid search dialog" );
@@ -2319,7 +2319,7 @@ void SfxHelpTextWindow_Impl::FindHdl(sfx2::SearchDialog* pDlg)
                                 xTVCrsr->gotoRange( xText->getEnd(), sal_False );
                             else
                                 xTVCrsr->gotoRange( xText->getStart(), sal_False );
-                            FindHdl( NULL );
+                            FindHdl( nullptr );
                         }
                     }
                 }
@@ -2745,7 +2745,7 @@ void SfxHelpWindow_Impl::MakeLayout()
 
         if ( aRect.Width > 0 && aRect.Height > 0 )
         {
-            Rectangle aScreenRect = pScreenWin->GetClientWindowExtentsRelative( NULL );
+            Rectangle aScreenRect = pScreenWin->GetClientWindowExtentsRelative( nullptr );
             Point aNewPos = aScreenRect.TopLeft();
             sal_Int32 nDiffWidth = nOldWidth - nWidth;
             aNewPos.X() += nDiffWidth;
@@ -2856,7 +2856,7 @@ void SfxHelpWindow_Impl::SaveConfig()
     aUserData += OUString::number( nH );
 
     vcl::Window* pScreenWin = VCLUnoHelper::GetWindow( xWindow );
-    aWinPos = pScreenWin->GetWindowExtentsRelative( NULL ).TopLeft();
+    aWinPos = pScreenWin->GetWindowExtentsRelative( nullptr ).TopLeft();
     aUserData += ";";
     aUserData += OUString::number( aWinPos.X() );
     aUserData += ";";
@@ -3016,8 +3016,8 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl(
     SplitWindow( pParent, WB_3DLOOK | WB_NOSPLITDRAW ),
 
     xFrame              ( rFrame ),
-    pIndexWin           ( NULL ),
-    pTextWin            ( NULL ),
+    pIndexWin           ( nullptr ),
+    pTextWin            ( nullptr ),
     pHelpInterceptor    ( new HelpInterceptor_Impl() ),
     pHelpListener       ( new HelpListener_Impl( pHelpInterceptor ) ),
     nExpandWidth        ( 0 ),
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 5495437c89e1..7d46fbd3c4d9 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -217,7 +217,7 @@ OUString SfxHelp_Impl::GetHelpText( const OUString& aCommandURL, const OUString&
 
 SfxHelp::SfxHelp() :
     bIsDebug( false ),
-    pImp    ( NULL )
+    pImp    ( nullptr )
 {
     // read the environment variable "HELP_DEBUG"
     // if it's set, you will see debug output on active help
@@ -398,7 +398,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask   ,
         xDesktop->findFrame(  "OFFICE_HELP_TASK", FrameSearchFlag::TASKS | FrameSearchFlag::CREATE),
         UNO_QUERY);
     if (!xHelpTask.is())
-        return 0;
+        return nullptr;
 
     // create all internal windows and sub frames ...
     Reference< css::awt::XWindow >      xParentWindow = xHelpTask->getContainerWindow();
@@ -430,7 +430,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask   ,
     if (!xHelpContent.is())
     {
         pHelpWindow.disposeAndClear();
-        return NULL;
+        return nullptr;
     }
 
     xHelpContent->setName("OFFICE_HELP");
@@ -456,7 +456,7 @@ OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const vcl::Window* p
             aNewHelpId = pParent->GetHelpId();
             sHelpText = SfxHelp_Impl::GetHelpText( OStringToOUString(aNewHelpId, RTL_TEXTENCODING_UTF8), sModuleName );
             if (!sHelpText.isEmpty())
-                pParent = NULL;
+                pParent = nullptr;
             else
                 pParent = pParent->GetParent();
         }
@@ -494,7 +494,7 @@ static bool impl_hasHelpInstalled( const OUString &rLang = OUString() )
 
 bool SfxHelp::SearchKeyword( const OUString& rKeyword )
 {
-    return Start_Impl( OUString(), NULL, rKeyword );
+    return Start_Impl( OUString(), nullptr, rKeyword );
 }
 
 bool SfxHelp::Start( const OUString& rURL, const vcl::Window* pWindow )
@@ -587,9 +587,9 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const
                             //that for help
                             bTriedTabPage = true;
                             Dialog *pDialog = static_cast<Dialog*>(pParent);
-                            TabControl *pCtrl = pDialog->hasBuilder() ? pDialog->get<TabControl>("tabcontrol") : NULL;
-                            TabPage* pTabPage = pCtrl ? pCtrl->GetTabPage(pCtrl->GetCurPageId()) : NULL;
-                            vcl::Window *pTabChild = pTabPage ? pTabPage->GetWindow(GetWindowType::FirstChild) : NULL;
+                            TabControl *pCtrl = pDialog->hasBuilder() ? pDialog->get<TabControl>("tabcontrol") : nullptr;
+                            TabPage* pTabPage = pCtrl ? pCtrl->GetTabPage(pCtrl->GetCurPageId()) : nullptr;
+                            vcl::Window *pTabChild = pTabPage ? pTabPage->GetWindow(GetWindowType::FirstChild) : nullptr;
                             if (pTabChild)
                                 pParent = pTabChild;
                         }
@@ -622,7 +622,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const
         "OFFICE_HELP",
         FrameSearchFlag::CHILDREN);
 
-    SfxHelpWindow_Impl* pHelpWindow = 0;
+    SfxHelpWindow_Impl* pHelpWindow = nullptr;
     if (!xHelp.is())
         pHelpWindow = impl_createHelp(xHelp, xHelpContent);
     else
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 412ae047ab49..e78fad714138 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -108,7 +108,7 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, cons
 
         aTipHelpText = aSystemPath;
         aAccessibleName += aSystemPath;
-        oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL );
+        oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, nullptr );
         if ( !nError )
             aPickEntry.append( aCompactedSystemPath );
         else
@@ -157,7 +157,7 @@ SfxPickList::PickListEntry* SfxPickList::GetPickListEntry( sal_uInt32 nIndex )
     if ( nIndex < m_aPicklistVector.size() )
         return m_aPicklistVector[ nIndex ];
     else
-        return 0;
+        return nullptr;
 }
 
 void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index d77ad1d3b5eb..5cb144c5c2cf 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -121,7 +121,7 @@ css::uno::Sequence<OUString> SAL_CALL ShutdownIcon::getSupportedServiceNames()
 }
 
 bool ShutdownIcon::bModalMode = false;
-ShutdownIcon* ShutdownIcon::pShutdownIcon = NULL;
+ShutdownIcon* ShutdownIcon::pShutdownIcon = nullptr;
 
 #if !defined( ENABLE_QUICKSTART_APPLET )
 // To remove conditionals
@@ -152,8 +152,8 @@ bool LoadModule()
         loaded = true;
 #  else // UNX
         osl::Module plugin;
-        oslGenericFunction pTmpInit = NULL;
-        oslGenericFunction pTmpDeInit = NULL;
+        oslGenericFunction pTmpInit = nullptr;
+        oslGenericFunction pTmpDeInit = nullptr;
         if ( plugin.loadRelative( &thisModule, "libqstart_gtklo.so" ) )
         {
             pTmpInit = plugin.getFunctionSymbol( "plugin_init_sys_tray" );
@@ -203,11 +203,11 @@ void ShutdownIcon::deInitSystray()
         pDeInitSystray();
 
     m_bVeto = false;
-    pInitSystray = 0;
-    pDeInitSystray = 0;
+    pInitSystray = nullptr;
+    pDeInitSystray = nullptr;
 
     delete m_pFileDlg;
-    m_pFileDlg = NULL;
+    m_pFileDlg = nullptr;
     m_bInitialized = false;
 }
 
@@ -217,8 +217,8 @@ ShutdownIcon::ShutdownIcon( const css::uno::Reference< XComponentContext > & rxC
     m_bVeto ( false ),
     m_bListenForTermination ( false ),
     m_bSystemDialogs( false ),
-    m_pResMgr( NULL ),
-    m_pFileDlg( NULL ),
+    m_pResMgr( nullptr ),
+    m_pFileDlg( nullptr ),
     m_xContext( rxContext ),
     m_bInitialized( false )
 {
@@ -353,7 +353,7 @@ void ShutdownIcon::StartFileDialog()
         // Destroy instance as changing the system file dialog setting
         // forces us to create a new FileDialogHelper instance!
         delete m_pFileDlg;
-        m_pFileDlg = NULL;
+        m_pFileDlg = nullptr;
     }
 
     if ( !m_pFileDlg )
@@ -390,7 +390,7 @@ IMPL_LINK_TYPED( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused
                 Sequence< PropertyValue >   aArgs(3);
 
                 css::uno::Reference < css::task::XInteractionHandler2 > xInteraction(
-                    task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) );
+                    task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), nullptr) );
 
                 aArgs[0].Name = "InteractionHandler";
                 aArgs[0].Value <<= xInteraction;
@@ -547,7 +547,7 @@ void ShutdownIcon::terminateDesktop()
         Application::Quit();
 
     // remove the instance pointer
-    ShutdownIcon::pShutdownIcon = 0;
+    ShutdownIcon::pShutdownIcon = nullptr;
 }
 
 
@@ -565,7 +565,7 @@ ShutdownIcon* ShutdownIcon::createInstance()
     if (pShutdownIcon)
         return pShutdownIcon;
 
-    ShutdownIcon *pIcon = NULL;
+    ShutdownIcon *pIcon = nullptr;
     try {
         pIcon = new ShutdownIcon( comphelper::getProcessComponentContext() );
         pIcon->init ();
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 4f877ab666f4..986326f83e93 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -56,11 +56,11 @@ void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray();
 
 static ResMgr *pVCLResMgr;
 static GtkStatusIcon* pTrayIcon;
-static GtkWidget *pExitMenuItem = NULL;
-static GtkWidget *pOpenMenuItem = NULL;
-static GtkWidget *pDisableMenuItem = NULL;
+static GtkWidget *pExitMenuItem = nullptr;
+static GtkWidget *pOpenMenuItem = nullptr;
+static GtkWidget *pDisableMenuItem = nullptr;
 #ifdef ENABLE_GIO
-GFileMonitor* pMonitor = NULL;
+GFileMonitor* pMonitor = nullptr;
 #endif
 
 static void open_url_cb( GtkWidget *, gpointer data )
@@ -210,19 +210,19 @@ static void populate_menu( GtkWidget *pMenu )
     SvtModuleOptions aModuleOptions;
 
     if ( aModuleOptions.IsWriter() )
-        add_item (pMenuShell, WRITER_URL, NULL,
+        add_item (pMenuShell, WRITER_URL, nullptr,
                   SV_ICON_ID_TEXT, G_CALLBACK( open_url_cb ));
 
     if ( aModuleOptions.IsCalc() )
-        add_item (pMenuShell, CALC_URL, NULL,
+        add_item (pMenuShell, CALC_URL, nullptr,
                   SV_ICON_ID_SPREADSHEET, G_CALLBACK( open_url_cb ));
 
     if ( aModuleOptions.IsImpress() )
-        add_item (pMenuShell, IMPRESS_URL, NULL,
+        add_item (pMenuShell, IMPRESS_URL, nullptr,
                   SV_ICON_ID_PRESENTATION, G_CALLBACK( open_url_cb ));
 
     if ( aModuleOptions.IsDraw() )
-        add_item (pMenuShell, DRAW_URL, NULL,
+        add_item (pMenuShell, DRAW_URL, nullptr,
                   SV_ICON_ID_DRAWING, G_CALLBACK( open_url_cb ));
 
     if ( aModuleOptions.IsDataBase() )
@@ -230,7 +230,7 @@ static void populate_menu( GtkWidget *pMenu )
                           SV_ICON_ID_DATABASE, G_CALLBACK( open_url_cb ));
 
     if ( aModuleOptions.IsMath() )
-        add_item (pMenuShell, MATH_URL, NULL,
+        add_item (pMenuShell, MATH_URL, nullptr,
                   SV_ICON_ID_FORMULA, G_CALLBACK( open_url_cb ));
 
     OUString aULabel = pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE );
@@ -286,7 +286,7 @@ static gboolean display_menu_cb( GtkWidget *,
 
     refresh_menu( pMenu );
 
-    gtk_menu_popup( GTK_MENU( pMenu ), NULL, NULL,
+    gtk_menu_popup( GTK_MENU( pMenu ), nullptr, nullptr,
                     gtk_status_icon_position_menu, pTrayIcon,
                     0, event->time );
 
@@ -354,14 +354,14 @@ void plugin_init_sys_tray()
     ShutdownIcon::addTerminateListener();
 
 #ifdef ENABLE_GIO
-    GFile* pFile = NULL;
+    GFile* pFile = nullptr;
     OUString sLibraryFileUrl;
     if (osl::Module::getUrlFromAddress(plugin_init_sys_tray, sLibraryFileUrl))
         pFile = g_file_new_for_uri(OUStringToOString(sLibraryFileUrl, RTL_TEXTENCODING_UTF8).getStr());
 
     if (pFile)
     {
-        if ((pMonitor = g_file_monitor_file(pFile, G_FILE_MONITOR_NONE, NULL, NULL)))
+        if ((pMonitor = g_file_monitor_file(pFile, G_FILE_MONITOR_NONE, nullptr, nullptr)))
             g_signal_connect(pMonitor, "changed", reinterpret_cast<GCallback>(notify_file_changed), NULL);
         g_object_unref(pFile);
     }
@@ -381,16 +381,16 @@ void plugin_shutdown_sys_tray()
             reinterpret_cast<gpointer>(&notify_file_changed), pMonitor);
         g_file_monitor_cancel(pMonitor);
         g_object_unref(pMonitor);
-        pMonitor = NULL;
+        pMonitor = nullptr;
     }
 #endif
 
     g_object_unref(pTrayIcon);
-    pTrayIcon = NULL;
+    pTrayIcon = nullptr;
 
-    pExitMenuItem = NULL;
-    pOpenMenuItem = NULL;
-    pDisableMenuItem = NULL;
+    pExitMenuItem = nullptr;
+    pOpenMenuItem = nullptr;
+    pDisableMenuItem = nullptr;
 }
 
 #endif // ENABLE_QUICKSTART_APPLET
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index baae2c1c6c6e..e1e7e1cd08fc 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -232,7 +232,7 @@ throw( css::uno::RuntimeException, std::exception )
     SolarMutexGuard aGuard;
 
     // reset member
-    m_pWrkWin = 0;
+    m_pWrkWin = nullptr;
 
     css::uno::Reference< css::frame::XFrame > xFrame( m_xFrame.get(), css::uno::UNO_QUERY );
     if ( xFrame.is() )
@@ -277,7 +277,7 @@ void SAL_CALL LayoutManagerListener::disposing(
 throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    m_pWrkWin = 0;
+    m_pWrkWin = nullptr;
     m_bHasFrame = false;
     m_xFrame.clear();
 }
@@ -483,7 +483,7 @@ SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( vcl::Window *pWin, SfxFrame *pFrm, S
     : SfxWorkWindow(
         pWin,
         pFrm->GetCurrentViewFrame()->GetBindings(),
-        pFrm->GetParentFrame() ? pFrm->GetParentFrame()->GetWorkWindow_Impl() : NULL )
+        pFrm->GetParentFrame() ? pFrm->GetParentFrame()->GetWorkWindow_Impl() : nullptr )
     , pMasterFrame( pMaster )
     , pFrame( pFrm )
 {
@@ -506,7 +506,7 @@ SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( vcl::Window *pWin, SfxFrame *pFrm, S
                             n == SFX_SPLITWINDOWS_RIGHT ? SfxChildAlignment::RIGHT :
                             n == SFX_SPLITWINDOWS_TOP ? SfxChildAlignment::TOP :
                                 SfxChildAlignment::BOTTOM );
-        VclPtr<SfxSplitWindow> pSplitWin = VclPtr<SfxSplitWindow>::Create(pWorkWin, eAlign, this, pParent==0 );
+        VclPtr<SfxSplitWindow> pSplitWin = VclPtr<SfxSplitWindow>::Create(pWorkWin, eAlign, this, pParent==nullptr );
         pSplit[n] = pSplitWin;
     }
 
@@ -521,8 +521,8 @@ SfxWorkWindow::SfxWorkWindow( vcl::Window *pWin, SfxBindings& rB, SfxWorkWindow*
     pParent( pParentWorkwin ),
     pBindings(&rB),
     pWorkWin (pWin),
-    pConfigShell( 0 ),
-    pActiveChild( 0 ),
+    pConfigShell( nullptr ),
+    pActiveChild( nullptr ),
     nUpdateMode(SFX_VISIBILITY_STANDARD),
     nChildren( 0 ),
     nOrigMode( 0 ),
@@ -632,7 +632,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
             // since this window is also destroyed (see below).
             if (pCW->pCli)
                 ReleaseChild_Impl(*pChild->GetWindow());
-            pCW->pWin = 0;
+            pCW->pWin = nullptr;
             pWorkWin->GetSystemWindow()->GetTaskPaneList()->RemoveWindow( pChild->GetWindow() );
             pChild->Destroy();
         }
@@ -700,7 +700,7 @@ void SfxFrameWorkWin_Impl::ArrangeChildren_Impl( bool bForce )
     if ( pFrame->IsClosing_Impl() || ( m_nLock && !bForce ))
         return;
 
-    SfxInPlaceClient *pClient = 0;
+    SfxInPlaceClient *pClient = nullptr;
     SfxViewFrame *pF = pFrame->GetCurrentViewFrame();
     if ( pF && pF->GetViewShell() )
         pClient = pF->GetViewShell()->GetIPClient();
@@ -730,7 +730,7 @@ void SfxFrameWorkWin_Impl::ArrangeChildren_Impl( bool bForce )
 
     pMasterFrame->SetToolSpaceBorderPixel_Impl( aBorder );
 
-    ArrangeAutoHideWindows( NULL );
+    ArrangeAutoHideWindows( nullptr );
 }
 
 
@@ -926,7 +926,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( vcl::Window& rWindow,
 void SfxWorkWindow::ReleaseChild_Impl( vcl::Window& rWindow )
 {
 
-    SfxChild_Impl *pChild = 0;
+    SfxChild_Impl *pChild = nullptr;
     sal_uInt16 nPos;
     for ( nPos = 0; nPos < aChildren.size(); ++nPos )
     {
@@ -960,7 +960,7 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const vcl::Window& rWindow ) const
             return pChild;
     }
 
-    return 0;
+    return nullptr;
 }
 
 
@@ -972,7 +972,7 @@ void SfxWorkWindow::ShowChildren_Impl()
 
     for ( size_t nPos = 0; nPos < aChildren.size(); ++nPos )
     {
-        SfxChildWin_Impl* pCW = 0;
+        SfxChildWin_Impl* pCW = nullptr;
         SfxChild_Impl *pCli = aChildren[nPos];
 
         if ( pCli && pCli->pWin )
@@ -1339,8 +1339,8 @@ bool SfxWorkWindow::AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW
 {
     // or checking the availability of child windows, we need access to the module
     const SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
-    const SfxObjectShell* pShell = pViewFrame ? pViewFrame->GetObjectShell() : NULL;
-    const SfxModule* pModule = pShell ? pShell->GetModule() : NULL;
+    const SfxObjectShell* pShell = pViewFrame ? pViewFrame->GetObjectShell() : nullptr;
+    const SfxModule* pModule = pShell ? pShell->GetModule() : nullptr;
     ENSURE_OR_RETURN( pModule, "SfxWorkWindow::UpdateChildWindows_Impl: did not find an SfxModule to ask for the child win availability!", true );
     return pModule->IsChildWindowAvailable( i_rCW.nId, pViewFrame );
 }
@@ -1357,7 +1357,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
         {
             // In the context is an appropriate ChildWindow allowed;
             // it is also turned on?
-            if ( pChildWin == NULL && pCW->bCreate )
+            if ( pChildWin == nullptr && pCW->bCreate )
             {
                 // Internal docking is only used for embedding into another
                 // container. We force the floating state of all floatable
@@ -1518,7 +1518,7 @@ void SfxWorkWindow::RemoveChildWin_Impl( SfxChildWin_Impl *pCW )
     {
         // Child window is a direct child window and must therefore unregister
         // itself from the  WorkWindow
-        pCW->pCli = 0;
+        pCW->pCli = nullptr;
         ReleaseChild_Impl(*pChildWin->GetWindow());
     }
     else
@@ -1528,7 +1528,7 @@ void SfxWorkWindow::RemoveChildWin_Impl( SfxChildWin_Impl *pCW )
     }
 
     pWorkWin->GetSystemWindow()->GetTaskPaneList()->RemoveWindow( pChildWin->GetWindow() );
-    pCW->pWin = 0;
+    pCW->pWin = nullptr;
     pChildWin->Destroy();
 
     GetBindings().Invalidate( nId );
@@ -1622,10 +1622,10 @@ void SfxWorkWindow::HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId )
 void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
             SfxDockingConfig eConfig, sal_uInt16 nId)
 {
-    SfxDockingWindow* pDockWin=0;
+    SfxDockingWindow* pDockWin=nullptr;
     sal_uInt16 nPos = USHRT_MAX;
-    vcl::Window *pWin=0;
-    SfxChildWin_Impl *pCW = 0;
+    vcl::Window *pWin=nullptr;
+    SfxChildWin_Impl *pCW = nullptr;
 
     if ( eChild == SfxChildIdentifier::OBJECTBAR )
         return;
@@ -1671,7 +1671,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
             if ( eConfig == SfxDockingConfig::TOGGLEFLOATMODE)
             {
                 // DockingWindow was dragged into a SplitWindow
-                pCW->pCli = 0;
+                pCW->pCli = nullptr;
                 ReleaseChild_Impl(*pDockWin);
             }
 
@@ -1808,7 +1808,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
                 return;
 
             SfxChildAlignment eAlign = SfxChildAlignment::NOALIGNMENT;
-            SfxChild_Impl *pCli = ( nPos != USHRT_MAX ) ? aChildren[nPos] : 0;
+            SfxChild_Impl *pCli = ( nPos != USHRT_MAX ) ? aChildren[nPos] : nullptr;
             if ( pCli && pDockWin )
             {
                 eAlign = pDockWin->GetAlignment();
@@ -1854,7 +1854,7 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, bool bEnabled, s
     sal_uInt16 nInter = (sal_uInt16) ( lId >> 16 );
     sal_uInt16 nId = (sal_uInt16) ( lId & 0xFFFF );
 
-    SfxChildWin_Impl *pCW=NULL;
+    SfxChildWin_Impl *pCW=nullptr;
     SfxWorkWindow *pWork = pParent;
 
     // Get the top parent, child windows are always registered at the
@@ -2044,7 +2044,7 @@ bool SfxWorkWindow::HasChildWindow_Impl(sal_uInt16 nId)
 
 bool SfxWorkWindow::IsFloating( sal_uInt16 nId )
 {
-    SfxChildWin_Impl *pCW=NULL;
+    SfxChildWin_Impl *pCW=nullptr;
     SfxWorkWindow *pWork = pParent;
 
     // Get the top parent, child windows are always registered at the
@@ -2102,7 +2102,7 @@ bool SfxWorkWindow::IsFloating( sal_uInt16 nId )
 
 bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId)
 {
-    SfxChildWin_Impl *pCW=0;
+    SfxChildWin_Impl *pCW=nullptr;
     sal_uInt16 nCount = aChildWins.size();
     sal_uInt16 n;
     for (n=0; n<nCount; n++)
@@ -2128,7 +2128,7 @@ bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId)
 
 void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, bool bOn, bool bSetFocus)
 {
-    SfxChildWin_Impl *pCW=NULL;
+    SfxChildWin_Impl *pCW=nullptr;
     SfxWorkWindow *pWork = pParent;
 
     // Get the top parent, child windows are always registered at the
@@ -2181,7 +2181,7 @@ void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, bool bOn, bool bSetFocus
 void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, bool bVisible, bool bSetFocus)
 {
     sal_uInt16 nCount = aChildWins.size();
-    SfxChildWin_Impl* pCW=0;
+    SfxChildWin_Impl* pCW=nullptr;
     sal_uInt16 n;
     for (n=0; n<nCount; n++)
     {
@@ -2278,7 +2278,7 @@ SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(sal_uInt16 nId)
         return aChildWins[n]->pWin;
     else if ( pParent )
         return pParent->GetChildWindow_Impl( nId );
-    return 0;
+    return nullptr;
 }
 
 
@@ -2334,8 +2334,8 @@ void SfxWorkWindow::SaveStatus_Impl(SfxChildWindow *pChild, const SfxChildWinInf
 void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
 {
     SfxDispatcher *pDisp = pBindings->GetDispatcher_Impl();
-    SfxViewFrame *pFrame = pDisp ? pDisp->GetFrame() :0;
-    SfxModule *pMod = pFrame ? SfxModule::GetActiveModule(pFrame) :0;
+    SfxViewFrame *pFrame = pDisp ? pDisp->GetFrame() :nullptr;
+    SfxModule *pMod = pFrame ? SfxModule::GetActiveModule(pFrame) :nullptr;
 
     OUString sModule;
     if (pFrame)
@@ -2354,7 +2354,7 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
         }
     }
 
-    SfxChildWinFactory* pFact=0;
+    SfxChildWinFactory* pFact=nullptr;
     SfxApplication *pApp = SfxGetpApp();
     {
         SfxChildWinFactArr_Impl &rFactories = pApp->GetChildWinFactories_Impl();
@@ -2431,7 +2431,7 @@ SfxSplitWindow* SfxWorkWindow::GetSplitWindow_Impl( SfxChildAlignment eAlign )
             return pSplit[1];
 
         default:
-            return 0;
+            return nullptr;
     }
 }
 
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 139506369909..9e952baf5696 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -68,7 +68,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolde
     ::ucbhelper::Content aContent;
     if( ::ucbhelper::Content::create( aFolderUrl, xComEnv, comphelper::getProcessComponentContext(), aContent ) )
     {
-        SvStream* pTempStream = NULL;
+        SvStream* pTempStream = nullptr;
 
         OUString aTempURL = ::utl::TempFile().GetURL();
         try {
@@ -91,8 +91,8 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolde
                     if ( aStorage->GetError() || aTargetStorage->GetError() || pTempStream->GetError() )
                         throw io::IOException();
 
-                    aTargetStorage = NULL;
-                    aStorage = NULL;
+                    aTargetStorage = nullptr;
+                    aStorage = nullptr;
 
                     pTempStream->Seek( 0 );