loplugin:nullptr (automatic rewrite)

Change-Id: I7fc4b4d5c895f241cfb052b009e943e073f3befe

16 files changed, 78 insertions, 78 deletions

diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index ce325fd018eb..3ea93dbd90e7 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.cxx
@@ -225,18 +225,18 @@ static const PopupMenu* lcl_FindPopupFromItemId( const PopupMenu* pPopupMenu, sa
                 return pPopupMenu;
             else
             {
-                const PopupMenu* pResult( 0 );
+                const PopupMenu* pResult( nullptr );
 
                 const PopupMenu* pSubPopup = pPopupMenu->GetPopupMenu( i );
                 if ( pPopupMenu )
                     pResult = lcl_FindPopupFromItemId( pSubPopup, nItemId );
-                if ( pResult != 0 )
+                if ( pResult != nullptr )
                     return pResult;
             }
         }
     }
 
-    return NULL;
+    return nullptr;
 }
 
 static OUString lcl_GetItemCommandRecursive( const PopupMenu* pPopupMenu, sal_uInt16 nItemId )
@@ -367,7 +367,7 @@ ContextMenuHelper::dispatchCommand(
         pExecuteInfo->aTargetURL   = aTargetURL;
         pExecuteInfo->aArgs        = m_aDefaultArgs;
 
-        Application::PostUserEvent( LINK(0, ContextMenuHelper , ExecuteHdl_Impl), pExecuteInfo );
+        Application::PostUserEvent( LINK(nullptr, ContextMenuHelper , ExecuteHdl_Impl), pExecuteInfo );
         return true;
     }
 
diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx
index 98184a1d56cf..d8ecef4fff67 100644
--- a/svtools/source/uno/generictoolboxcontroller.cxx
+++ b/svtools/source/uno/generictoolboxcontroller.cxx
@@ -119,7 +119,7 @@ throw ( RuntimeException, std::exception )
         pExecuteInfo->xDispatch     = xDispatch;
         pExecuteInfo->aTargetURL    = aTargetURL;
         pExecuteInfo->aArgs         = aArgs;
-        Application::PostUserEvent( LINK(0, GenericToolboxController , ExecuteHdl_Impl), pExecuteInfo );
+        Application::PostUserEvent( LINK(nullptr, GenericToolboxController , ExecuteHdl_Impl), pExecuteInfo );
     }
 }
 
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index 8713938d37cc..65b365bc0542 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -48,7 +48,7 @@ namespace svt
 
 OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxContext)
         :OPropertyContainer(GetBroadcastHelper())
-        ,m_pDialog(NULL)
+        ,m_pDialog(nullptr)
         ,m_bExecuting(false)
         ,m_bCanceled(false)
         ,m_bTitleAmbiguous(true)
@@ -170,7 +170,7 @@ bool OGenericUnoDialog::impl_ensureDialog_lck()
     // get the parameters for the dialog from the current settings
 
     // the parent window
-    vcl::Window* pParent = NULL;
+    vcl::Window* pParent = nullptr;
     VCLXWindow* pImplementation = VCLXWindow::GetImplementation(m_xParent);
     if (pImplementation)
         pParent = pImplementation->GetWindow();
@@ -202,7 +202,7 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute(  ) throw(RuntimeException, std::e
     // both creation and execution of the dialog must be guarded with the SolarMutex, so be generous here
     SolarMutexGuard aSolarGuard;
 
-    Dialog* pDialogToExecute = NULL;
+    Dialog* pDialogToExecute = nullptr;
     // create the dialog, if necessary
     {
         UnoDialogEntryGuard aGuard( *this );
@@ -322,7 +322,7 @@ IMPL_LINK_TYPED( OGenericUnoDialog, OnDialogDying, VclWindowEvent&, _rEvent, voi
 {
     OSL_ENSURE( _rEvent.GetWindow() == m_pDialog, "OGenericUnoDialog::OnDialogDying: where does this come from?" );
     if ( _rEvent.GetId() == VCLEVENT_OBJECT_DYING )
-        m_pDialog = NULL;
+        m_pDialog = nullptr;
 }
 
 
diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index ff1dcf77e944..5bc360795a61 100644
--- a/svtools/source/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.cxx
@@ -39,7 +39,7 @@ namespace
             FilePicker_CreateInstance,
             FilePicker_getImplementationName,
             FilePicker_getSupportedServiceNames,
-            ::cppu::createSingleComponentFactory, 0, 0
+            ::cppu::createSingleComponentFactory, nullptr, 0
         },
         {
             // FolderPicker should not use a constructor, it is only a
@@ -47,9 +47,9 @@ namespace
             FolderPicker_CreateInstance,
             FolderPicker_getImplementationName,
             FolderPicker_getSupportedServiceNames,
-            ::cppu::createSingleComponentFactory, 0, 0
+            ::cppu::createSingleComponentFactory, nullptr, 0
         },
-        { 0, 0, 0, 0, 0, 0 }
+        { nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
     };
 }
 
@@ -59,7 +59,7 @@ extern "C"
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL svt_component_getFactory(
     const sal_Char * pImplementationName, void * _pServiceManager, void * pRegistryKey)
 {
-    void * pResult = 0;
+    void * pResult = nullptr;
     if (_pServiceManager)
     {
         Reference< XMultiServiceFactory > xSMgr(static_cast< XMultiServiceFactory * >(_pServiceManager));
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index 914ae1da651e..b455692b158f 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -139,7 +139,7 @@ void PopupMenuControllerBase::dispatchCommand( const OUString& sCommandURL, cons
 
         Reference< XDispatch > xDispatch( xDispatchProvider->queryDispatch( aURL, OUString(), 0 ), UNO_QUERY_THROW );
 
-        Application::PostUserEvent( LINK(0, PopupMenuControllerBase, ExecuteHdl_Impl), new PopupMenuControllerBaseDispatchInfo( xDispatch, aURL, rArgs ) );
+        Application::PostUserEvent( LINK(nullptr, PopupMenuControllerBase, ExecuteHdl_Impl), new PopupMenuControllerBaseDispatchInfo( xDispatch, aURL, rArgs ) );
 
     }
     catch( Exception& )
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx
index 127ba7a6f0c4..be1b07e64851 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -50,15 +50,15 @@ private:
 };
 
 PopupWindowControllerImpl::PopupWindowControllerImpl()
-: mpPopupWindow( 0 )
-, mpToolBox( 0 )
+: mpPopupWindow( nullptr )
+, mpToolBox( nullptr )
 {
 }
 
 PopupWindowControllerImpl::~PopupWindowControllerImpl()
 {
     if( mpPopupWindow )
-        SetPopupWindow(0,0);
+        SetPopupWindow(nullptr,nullptr);
 }
 
 void PopupWindowControllerImpl::SetPopupWindow( vcl::Window* pPopupWindow, ToolBox* pToolBox )
@@ -83,7 +83,7 @@ IMPL_LINK_TYPED( PopupWindowControllerImpl, WindowEventListener, VclWindowEvent&
     {
     case VCLEVENT_WINDOW_CLOSE:
     case VCLEVENT_WINDOW_ENDPOPUPMODE:
-        SetPopupWindow(0,0);
+        SetPopupWindow(nullptr,nullptr);
         break;
 
     case VCLEVENT_WINDOW_SHOW:
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 63928d1471c8..b45f5abff8bb 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -688,7 +688,7 @@ void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequ
         Reference< XDispatch > xDispatch( xDispatchProvider->queryDispatch( aURL, sTarget, 0 ), UNO_QUERY_THROW );
 
         DispatchInfo *pDispatchInfo = new DispatchInfo( xDispatch, aURL, rArgs );
-        if ( !Application::PostUserEvent( LINK(0, ToolboxController, ExecuteHdl_Impl),
+        if ( !Application::PostUserEvent( LINK(nullptr, ToolboxController, ExecuteHdl_Impl),
                                           pDispatchInfo ) )
             delete pDispatchInfo;
 
@@ -772,7 +772,7 @@ IMPL_STATIC_LINK_TYPED( ToolboxController, ExecuteHdl_Impl, void*, p, void )
 
 void ToolboxController::enable( bool bEnable )
 {
-    ToolBox* pToolBox = 0;
+    ToolBox* pToolBox = nullptr;
     sal_uInt16 nItemId = 0;
     if( getToolboxId( nItemId, &pToolBox ) )
     {
@@ -782,7 +782,7 @@ void ToolboxController::enable( bool bEnable )
 
 bool ToolboxController::getToolboxId( sal_uInt16& rItemId, ToolBox** ppToolBox )
 {
-    if( (m_nToolBoxId != SAL_MAX_UINT16) && (ppToolBox == 0) )
+    if( (m_nToolBoxId != SAL_MAX_UINT16) && (ppToolBox == nullptr) )
         return m_nToolBoxId;
 
     ToolBox* pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ).get() );
@@ -806,7 +806,7 @@ bool ToolboxController::getToolboxId( sal_uInt16& rItemId, ToolBox** ppToolBox )
 
     rItemId = m_nToolBoxId;
 
-    return (rItemId != SAL_MAX_UINT16) && (( ppToolBox == 0) || (*ppToolBox != 0) );
+    return (rItemId != SAL_MAX_UINT16) && (( ppToolBox == nullptr) || (*ppToolBox != nullptr) );
 }
 //end
 
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 8a729d27d8f6..0f4ed9b865d0 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -143,9 +143,9 @@ TreeControlPeer::TreeControlPeer()
     , maTreeExpansionListeners( *this )
     , maTreeEditListeners( *this )
     , mbIsRootDisplayed(false)
-    , mpTreeImpl( 0 )
+    , mpTreeImpl( nullptr )
     , mnEditLock( 0 )
-    , mpTreeNodeMap( 0 )
+    , mpTreeNodeMap( nullptr )
 {
 }
 
@@ -201,7 +201,7 @@ UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode
     if( bThrow )
         throw IllegalArgumentException();
 
-    return 0;
+    return nullptr;
 }
 
 
@@ -218,8 +218,8 @@ vcl::Window* TreeControlPeer::createVclControl( vcl::Window* pParent, sal_Int64
 void TreeControlPeer::disposeControl()
 {
     delete mpTreeNodeMap;
-    mpTreeNodeMap = 0;
-    mpTreeImpl = 0;
+    mpTreeNodeMap = nullptr;
+    mpTreeImpl = nullptr;
 }
 
 
@@ -233,7 +233,7 @@ void TreeControlPeer::SetWindow( const VclPtr< vcl::Window > &pWindow )
 
 UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uLong nPos /* = TREELIST_APPEND */ )
 {
-    UnoTreeListEntry* pEntry = 0;
+    UnoTreeListEntry* pEntry = nullptr;
     if( mpTreeImpl )
     {
         Image aImage;
@@ -423,13 +423,13 @@ void TreeControlPeer::fillTree( UnoTreeListBoxImpl& rTree, const Reference< XTre
         {
             if( mbIsRootDisplayed )
             {
-                addNode( rTree, xRootNode, 0 );
+                addNode( rTree, xRootNode, nullptr );
             }
             else
             {
                 const sal_Int32 nChildCount = xRootNode->getChildCount();
                 for( sal_Int32 nChild = 0; nChild < nChildCount; nChild++ )
-                    addNode( rTree, xRootNode->getChildAt( nChild ), 0 );
+                    addNode( rTree, xRootNode->getChildAt( nChild ), nullptr );
             }
         }
     }
@@ -467,7 +467,7 @@ void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect,
 
     Reference< XTreeNode > xTempNode;
 
-    const Reference< XTreeNode > *pNodes = 0;
+    const Reference< XTreeNode > *pNodes = nullptr;
     sal_Int32 nCount = 0;
 
     if( rSelection.hasValue() )
@@ -556,7 +556,7 @@ Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException, std::excep
             --nSelectionCount;
         }
 
-        OSL_ASSERT( (pEntry == 0) && (nSelectionCount == 0) );
+        OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) );
         aRet <<= aSelection;
     }
 
@@ -667,7 +667,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration()
         --nSelectionCount;
     }
 
-    OSL_ASSERT( (pEntry == 0) && (nSelectionCount == 0) );
+    OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) );
 
     return Reference< XEnumeration >( new TreeSelectionEnumeration( aSelection ) );
 }
@@ -691,7 +691,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer
         --nSelectionCount;
     }
 
-    OSL_ASSERT( (pEntry == 0) && (nSelectionCount == 0) );
+    OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) );
 
     return Reference< XEnumeration >( new TreeSelectionEnumeration( aSelection ) );
 }
@@ -1076,7 +1076,7 @@ void TreeControlPeer::updateNode( UnoTreeListBoxImpl& rTree, const Reference< XT
         if( !pNodeEntry )
         {
             Reference< XTreeNode > xParentNode( xNode->getParent() );
-            UnoTreeListEntry* pParentEntry = 0;
+            UnoTreeListEntry* pParentEntry = nullptr;
             sal_uLong nChild = TREELIST_APPEND;
 
             if( xParentNode.is() )
@@ -1106,7 +1106,7 @@ void TreeControlPeer::updateChildNodes( UnoTreeListBoxImpl& rTree, const Referen
             if( !pCurrentChild || ( pCurrentChild->mxNode != xNode ) )
             {
                 UnoTreeListEntry* pNodeEntry = getEntry( xNode, false );
-                if( pNodeEntry == 0 )
+                if( pNodeEntry == nullptr )
                 {
                     // child node is not yet part of the tree, add it
                     pCurrentChild = createEntry( xNode, pParentEntry, nChild );
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index 66a3b96ce846..29aacfa70e80 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -266,7 +266,7 @@ namespace svt { namespace table
 
         // dispose the column
         UnoGridColumnFacade* pColumnImpl = dynamic_cast< UnoGridColumnFacade* >( pColumn.get() );
-        OSL_ENSURE( pColumnImpl != NULL, "UnoControlTableModel::removeColumn: illegal column implementation!" );
+        OSL_ENSURE( pColumnImpl != nullptr, "UnoControlTableModel::removeColumn: illegal column implementation!" );
         if ( pColumnImpl )
             pColumnImpl->dispose();
     }
@@ -497,7 +497,7 @@ namespace svt { namespace table
 
             PColumnModel const pColumn = getColumnModel( i_col );
             UnoGridColumnFacade* pColumnImpl = dynamic_cast< UnoGridColumnFacade* >( pColumn.get() );
-            ENSURE_OR_RETURN_VOID( pColumnImpl != NULL, "UnoControlTableModel::getCellContent: no (valid) column at this position!" );
+            ENSURE_OR_RETURN_VOID( pColumnImpl != nullptr, "UnoControlTableModel::getCellContent: no (valid) column at this position!" );
             sal_Int32 const nDataColumnIndex = pColumnImpl->getDataColumnIndex() >= 0 ? pColumnImpl->getDataColumnIndex() : i_col;
 
             if ( nDataColumnIndex >= xDataModel->getColumnCount() )
@@ -773,7 +773,7 @@ namespace svt { namespace table
         Reference< XSortableGridData > const xSortAccess( getDataModel(), UNO_QUERY );
         if ( xSortAccess.is() )
             return this;
-        return NULL;
+        return nullptr;
     }
 
 
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index 5abca39ef371..74ac2a7c9ee4 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -52,7 +52,7 @@ SvBaseEventDescriptor::SvBaseEventDescriptor( const SvEventDescription* pSupport
         mpSupportedMacroItems(pSupportedMacroItems),
         mnMacroItems(0)
 {
-    assert(pSupportedMacroItems != NULL && "Need a list of supported events!");
+    assert(pSupportedMacroItems != nullptr && "Need a list of supported events!");
 
     for( ; mpSupportedMacroItems[mnMacroItems].mnEvent != 0; mnMacroItems++) ;
 }
@@ -426,7 +426,7 @@ SvDetachedEventDescriptor::SvDetachedEventDescriptor(
     // ... and initialize
     for(sal_Int16 i = 0; i < mnMacroItems; i++)
     {
-        aMacros[i] = NULL;
+        aMacros[i] = nullptr;
     }
 }
 
@@ -435,7 +435,7 @@ SvDetachedEventDescriptor::~SvDetachedEventDescriptor()
     // delete contents of aMacros
     for(sal_Int16 i = 0; i < mnMacroItems; i++)
     {
-        if (NULL != aMacros[i])
+        if (nullptr != aMacros[i])
             delete aMacros[i];
     }
 
@@ -503,7 +503,7 @@ bool SvDetachedEventDescriptor::hasById(
     if (-1 == nIndex)
         throw IllegalArgumentException();
 
-    return (NULL != aMacros[nIndex]) && aMacros[nIndex]->HasMacro();
+    return (nullptr != aMacros[nIndex]) && aMacros[nIndex]->HasMacro();
 }
 
 
@@ -531,7 +531,7 @@ void SvMacroTableEventDescriptor::copyMacrosFromTable(
     {
         const sal_uInt16 nEvent = mpSupportedMacroItems[i].mnEvent;
         const SvxMacro* pMacro = rMacroTable.Get(nEvent);
-        if (NULL != pMacro)
+        if (nullptr != pMacro)
             replaceByName(nEvent, *pMacro);
     }
 
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index 944d971fcc48..5c739b68dfeb 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -129,7 +129,7 @@ namespace svt { namespace table
     void ColumnChangeMultiplexer::dispose()
     {
         DBG_TESTSOLARMUTEX();
-        m_pColumnImplementation = NULL;
+        m_pColumnImplementation = nullptr;
     }
 
 
@@ -138,7 +138,7 @@ namespace svt { namespace table
         if ( i_event.AttributeName == "DataColumnIndex" )
         {
             SolarMutexGuard aGuard;
-            if ( m_pColumnImplementation != NULL )
+            if ( m_pColumnImplementation != nullptr )
                 m_pColumnImplementation->dataColumnIndexChanged();
             return;
         }
@@ -161,7 +161,7 @@ namespace svt { namespace table
             "ColumnChangeMultiplexer::columnChanged: unknown column attributed changed!" );
 
         SolarMutexGuard aGuard;
-        if ( m_pColumnImplementation != NULL )
+        if ( m_pColumnImplementation != nullptr )
             m_pColumnImplementation->columnChanged( nChangedAttributes );
     }
 
@@ -193,13 +193,13 @@ namespace svt { namespace table
     void UnoGridColumnFacade::dispose()
     {
         DBG_TESTSOLARMUTEX();
-        ENSURE_OR_RETURN_VOID( m_pOwner != NULL, "UnoGridColumnFacade::dispose: already disposed!" );
+        ENSURE_OR_RETURN_VOID( m_pOwner != nullptr, "UnoGridColumnFacade::dispose: already disposed!" );
 
         m_xGridColumn->removeGridColumnListener( m_pChangeMultiplexer.get() );
         m_pChangeMultiplexer->dispose();
         m_pChangeMultiplexer.clear();
         m_xGridColumn.clear();
-        m_pOwner = NULL;
+        m_pOwner = nullptr;
     }
 
 
@@ -222,7 +222,7 @@ namespace svt { namespace table
     {
         DBG_TESTSOLARMUTEX();
         impl_updateDataColumnIndex_nothrow();
-        if ( m_pOwner != NULL )
+        if ( m_pOwner != nullptr )
             m_pOwner->notifyAllDataChanged();
     }
 
@@ -230,7 +230,7 @@ namespace svt { namespace table
     void UnoGridColumnFacade::columnChanged( ColumnAttributeGroup const i_attributeGroup )
     {
         DBG_TESTSOLARMUTEX();
-        if ( m_pOwner != NULL )
+        if ( m_pOwner != nullptr )
             m_pOwner->notifyColumnChange( m_pOwner->getColumnPos( *this ), i_attributeGroup );
     }
 
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 9f1d537ce3c3..7946fda76724 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -62,7 +62,7 @@ extern "C" {
 
 SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor* pDescriptor, vcl::Window* pParent, WinBits nWinBits )
 {
-    vcl::Window* pWindow = NULL;
+    vcl::Window* pWindow = nullptr;
     OUString aServiceName( pDescriptor->WindowServiceName );
     if ( aServiceName.equalsIgnoreAsciiCase( "MultiLineEdit" ) )
     {
@@ -74,8 +74,8 @@ SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const cs
         }
         else
         {
-            *ppNewComp = NULL;
-            return NULL;
+            *ppNewComp = nullptr;
+            return nullptr;
         }
     }
     else if ( aServiceName.equalsIgnoreAsciiCase( "FileControl" ) )
@@ -87,8 +87,8 @@ SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const cs
         }
         else
         {
-            *ppNewComp = NULL;
-            return NULL;
+            *ppNewComp = nullptr;
+            return nullptr;
         }
     }
     else if (aServiceName.equalsIgnoreAsciiCase("FormattedField") )
@@ -130,8 +130,8 @@ SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const cs
         }
         else
         {
-            *ppNewComp = NULL;
-            return NULL;
+            *ppNewComp = nullptr;
+            return nullptr;
         }
     }
     else if ( aServiceName.equalsIgnoreAsciiCase( "Tree" ) )
@@ -149,8 +149,8 @@ SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const cs
         }
         else
         {
-            *ppNewComp = NULL;
-            return NULL;
+            *ppNewComp = nullptr;
+            return nullptr;
         }
     }
     else if ( aServiceName.equalsIgnoreAsciiCase( "Grid" ) )
@@ -162,8 +162,8 @@ SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const cs
         }
         else
         {
-            *ppNewComp = NULL;
-            return NULL;
+            *ppNewComp = nullptr;
+            return nullptr;
         }
     }
     return pWindow;
@@ -811,7 +811,7 @@ void VCLXFileControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 
 
 SVTXFormattedField::SVTXFormattedField()
-    :m_pCurrentSupplier(NULL)
+    :m_pCurrentSupplier(nullptr)
     ,bIsStandardSupplier(true)
     ,nKeyToSetDelayed(-1)
 {
@@ -823,7 +823,7 @@ SVTXFormattedField::~SVTXFormattedField()
     if (m_pCurrentSupplier)
     {
         m_pCurrentSupplier->release();
-        m_pCurrentSupplier = NULL;
+        m_pCurrentSupplier = nullptr;
     }
 }
 
@@ -878,7 +878,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const css::u
 
             case BASEPROPERTY_FORMATSSUPPLIER:
                 if (!Value.hasValue())
-                    setFormatsSupplier(css::uno::Reference< css::util::XNumberFormatsSupplier > (NULL));
+                    setFormatsSupplier(css::uno::Reference< css::util::XNumberFormatsSupplier > (nullptr));
                 else
                 {
                     css::uno::Reference< css::util::XNumberFormatsSupplier > xNFS;
@@ -1302,7 +1302,7 @@ void SVTXFormattedField::setFormatsSupplier(const css::uno::Reference< css::util
 {
     FormattedField* pField = GetAs< FormattedField >();
 
-    SvNumberFormatsSupplierObj* pNew = NULL;
+    SvNumberFormatsSupplierObj* pNew = nullptr;
     if (!xSupplier.is())
     {
         if (pField)
@@ -2324,7 +2324,7 @@ void SAL_CALL SVTXDateField::setProperty( const OUString& PropertyName, const cs
 
     // some properties need to be forwarded to the sub edit, too
     SolarMutexGuard g;
-    VclPtr< Edit > pSubEdit = GetWindow() ? static_cast< Edit* >( GetWindow().get() )->GetSubEdit() : NULL;
+    VclPtr< Edit > pSubEdit = GetWindow() ? static_cast< Edit* >( GetWindow().get() )->GetSubEdit() : nullptr;
     if ( !pSubEdit )
         return;
 
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index f0a6b11dd44e..75d18ce5a3db 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -594,7 +594,7 @@ SvUnoImageMapObject* SvUnoImageMap::getObject( const Any& aElement )
     aElement >>= xObject;
 
     SvUnoImageMapObject* pObject = SvUnoImageMapObject::getImplementation( xObject );
-    if( NULL == pObject )
+    if( nullptr == pObject )
         throw IllegalArgumentException();
 
     return pObject;
@@ -606,7 +606,7 @@ void SAL_CALL SvUnoImageMap::insertByIndex( sal_Int32 Index, const Any& Element
 {
     SvUnoImageMapObject* pObject = getObject( Element );
     const sal_Int32 nCount = maObjectList.size();
-    if( NULL == pObject || Index > nCount )
+    if( nullptr == pObject || Index > nCount )
         throw IndexOutOfBoundsException();
 
     pObject->acquire();
@@ -649,7 +649,7 @@ void SAL_CALL SvUnoImageMap::replaceByIndex( sal_Int32 Index, const Any& Element
 {
     SvUnoImageMapObject* pObject = getObject( Element );
     const sal_Int32 nCount = maObjectList.size();
-    if( NULL == pObject || Index >= nCount )
+    if( nullptr == pObject || Index >= nCount )
         throw IndexOutOfBoundsException();
 
     std::list< SvUnoImageMapObject* >::iterator aIter = maObjectList.begin();
@@ -764,7 +764,7 @@ Reference< XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, cons
 bool SvUnoImageMap_fillImageMap( Reference< XInterface > xImageMap, ImageMap& rMap )
 {
     SvUnoImageMap* pUnoImageMap = SvUnoImageMap::getImplementation( xImageMap );
-    if( NULL == pUnoImageMap )
+    if( nullptr == pUnoImageMap )
         return false;
 
     return pUnoImageMap->fillImageMap( rMap );
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index ba07e6145c45..0184419c8c38 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -349,7 +349,7 @@ namespace {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        ENSURE_OR_RETURN( m_pDialog, "Wizard::getDialogWindow: illegal call (execution did not start, yet)!", NULL );
+        ENSURE_OR_RETURN( m_pDialog, "Wizard::getDialogWindow: illegal call (execution did not start, yet)!", nullptr );
         return Reference< XWindow >( m_pDialog->GetComponentInterface(), UNO_QUERY );
     }
 
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx
index 3951c93d8cee..b48eb3ae9dc9 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.cxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx
@@ -98,12 +98,12 @@ namespace svt { namespace uno
 
     TabPage* WizardPageController::getTabPage() const
     {
-        ENSURE_OR_RETURN( m_xWizardPage.is(), "WizardPageController::getTabPage: no external wizard page!", NULL );
+        ENSURE_OR_RETURN( m_xWizardPage.is(), "WizardPageController::getTabPage: no external wizard page!", nullptr );
         try
         {
             Reference< XWindow > xPageWindow( m_xWizardPage->getWindow(), UNO_SET_THROW );
             vcl::Window* pPageWindow = VCLUnoHelper::GetWindow( xPageWindow );
-            if ( pPageWindow == NULL )
+            if ( pPageWindow == nullptr )
             {
                 // windows created via the XContainerWindowProvider might be controls, not real windows, so resolve
                 // that one indirection
@@ -112,14 +112,14 @@ namespace svt { namespace uno
                 pPageWindow = VCLUnoHelper::GetWindow( xPageWindow );
             }
 
-            OSL_ENSURE( pPageWindow != NULL, "WizardPageController::getTabPage: unable to find the Window implementation for the page's window!" );
+            OSL_ENSURE( pPageWindow != nullptr, "WizardPageController::getTabPage: unable to find the Window implementation for the page's window!" );
             return dynamic_cast< TabPage* >( pPageWindow );
         }
         catch( const Exception& )
         {
             DBG_UNHANDLED_EXCEPTION();
         }
-        return NULL;
+        return nullptr;
     }
 
 
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index 744a9c41b818..6849f3f9e856 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -170,7 +170,7 @@ namespace svt { namespace uno
         const WizardState eState = getCurrentState();
 
         PWizardPageController pController( impl_getController( GetPage( eState ) ) );
-        ENSURE_OR_RETURN( pController, "WizardShell::getCurrentWizardPage: invalid page/controller!", NULL );
+        ENSURE_OR_RETURN( pController, "WizardShell::getCurrentWizardPage: invalid page/controller!", nullptr );
 
         return pController->getWizardPage();
     }
@@ -184,7 +184,7 @@ namespace svt { namespace uno
 
     VclPtr<TabPage> WizardShell::createPage( WizardState i_nState )
     {
-        ENSURE_OR_RETURN( m_xController.is(), "WizardShell::createPage: no WizardController!", NULL );
+        ENSURE_OR_RETURN( m_xController.is(), "WizardShell::createPage: no WizardController!", nullptr );
 
         std::shared_ptr< WizardPageController > pController( new WizardPageController( *this, m_xController, impl_stateToPageId( i_nState ) ) );
         VclPtr<TabPage> pPage = pController->getTabPage();