loplugin:nullptr (automatic rewrite)

Change-Id: Ied9204441c07f1f6a6026c8c1a2fa21b93b98e1a

42 files changed, 181 insertions, 181 deletions

diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index 844d36a88698..1fcd4452ad2b 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -92,7 +92,7 @@ namespace toolkit
     public:
         explicit StyleMethodGuard( WindowStyleSettings_Data& i_rData )
         {
-            if ( i_rData.pOwningWindow == NULL )
+            if ( i_rData.pOwningWindow == nullptr )
                 throw DisposedException();
         }
 
@@ -135,7 +135,7 @@ namespace toolkit
         EventObject aEvent( *this );
         m_pData->aStyleChangeListeners.disposeAndClear( aEvent );
 
-        m_pData->pOwningWindow = NULL;
+        m_pData->pOwningWindow = nullptr;
     }
 
 
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index b82fff5e0272..1d1e127baff6 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -73,7 +73,7 @@ VCLXAccessibleComponent::~VCLXAccessibleComponent()
     }
 
     delete m_pSolarLock;
-    m_pSolarLock = NULL;
+    m_pSolarLock = nullptr;
     // This is not completely safe. If we assume that the base class dtor calls some method which
     // uses this lock, the we crash. However, as the base class' dtor does not have a chance to call _out_
     // virtual methods, this is no problem as long as the base class is safe, i.e. does not use the external
@@ -190,7 +190,7 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind
             pAccWindow->RemoveEventListener( LINK( this, VCLXAccessibleComponent, WindowEventListener ) );
             pAccWindow->RemoveChildEventListener( LINK( this, VCLXAccessibleComponent, WindowChildEventListener ) );
             mxWindow.clear();
-            mpVCLXindow = NULL;
+            mpVCLXindow = nullptr;
         }
         break;
         case VCLEVENT_WINDOW_CHILDDESTROYED:
@@ -348,7 +348,7 @@ void VCLXAccessibleComponent::disposing()
     AccessibleExtendedComponentHelper_BASE::disposing();
 
     mxWindow.clear();
-    mpVCLXindow = NULL;
+    mpVCLXindow = nullptr;
 }
 
 VclPtr<vcl::Window> VCLXAccessibleComponent::GetWindow() const
@@ -697,12 +697,12 @@ awt::Rectangle VCLXAccessibleComponent::implGetBounds() throw (uno::RuntimeExcep
     vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
-        Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL );
+        Rectangle aRect = pWindow->GetWindowExtentsRelative( nullptr );
         aBounds = AWTRectangle( aRect );
         vcl::Window* pParent = pWindow->GetAccessibleParentWindow();
         if ( pParent )
         {
-            Rectangle aParentRect = pParent->GetWindowExtentsRelative( NULL );
+            Rectangle aParentRect = pParent->GetWindowExtentsRelative( nullptr );
             awt::Point aParentScreenLoc = AWTPoint( aParentRect.TopLeft() );
             aBounds.X -= aParentScreenLoc.X;
             aBounds.Y -= aParentScreenLoc.Y;
@@ -749,7 +749,7 @@ awt::Point VCLXAccessibleComponent::getLocationOnScreen(  ) throw (uno::RuntimeE
     awt::Point aPos;
     if ( GetWindow() )
     {
-        Rectangle aRect = GetWindow()->GetWindowExtentsRelative( NULL );
+        Rectangle aRect = GetWindow()->GetWindowExtentsRelative( nullptr );
         aPos.X = aRect.Left();
         aPos.Y = aRect.Top();
     }
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index 42b98bbb35eb..c9d230e5555a 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -132,7 +132,7 @@ void VCLXContainer::setTabOrder( const css::uno::Sequence< css::uno::Reference<
     const css::uno::Reference< css::awt::XWindow > * pComps = Components.getConstArray();
     const css::uno::Any* pTabs = Tabs.getConstArray();
 
-    vcl::Window* pPrevWin = NULL;
+    vcl::Window* pPrevWin = nullptr;
     for ( sal_uInt32 n = 0; n < nCount; n++ )
     {
         // css::style::TabStop
@@ -175,8 +175,8 @@ void VCLXContainer::setGroup( const css::uno::Sequence< css::uno::Reference< css
     sal_uInt32 nCount = Components.getLength();
     const css::uno::Reference< css::awt::XWindow > * pComps = Components.getConstArray();
 
-    vcl::Window* pPrevWin = NULL;
-    vcl::Window* pPrevRadio = NULL;
+    vcl::Window* pPrevWin = nullptr;
+    vcl::Window* pPrevRadio = nullptr;
     for ( sal_uInt32 n = 0; n < nCount; n++ )
     {
         vcl::Window* pWin = VCLUnoHelper::GetWindow( pComps[n] );
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index 70c8af992381..0c3132573347 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -43,7 +43,7 @@
 //  class VCLXDevice
 
 VCLXDevice::VCLXDevice()
-    : pDummy(NULL)
+    : pDummy(nullptr)
     , nFlags(0)
 {
 }
diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index 83e811962370..bea6aed231ac 100644
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.cxx
@@ -35,7 +35,7 @@
 
 VCLXFont::VCLXFont()
 {
-    mpFontMetric = NULL;
+    mpFontMetric = nullptr;
 }
 
 VCLXFont::~VCLXFont()
@@ -48,7 +48,7 @@ void VCLXFont::Init( css::awt::XDevice& rxDev, const vcl::Font& rFont )
     mxDevice = &rxDev;
 
     delete mpFontMetric;
-    mpFontMetric = NULL;
+    mpFontMetric = nullptr;
 
     maFont = rFont;
 }
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index 683db6b71734..64115931fe51 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -58,15 +58,15 @@ IMPL_XTYPEPROVIDER_START( VCLXGraphics )
 IMPL_XTYPEPROVIDER_END
 
 VCLXGraphics::VCLXGraphics()
-    : mpOutputDevice(NULL)
+    : mpOutputDevice(nullptr)
     , meRasterOp(ROP_OVERPAINT)
-    , mpClipRegion(NULL)
+    , mpClipRegion(nullptr)
 {
 }
 
 VCLXGraphics::~VCLXGraphics()
 {
-    std::vector< VCLXGraphics* > *pLst = mpOutputDevice ? mpOutputDevice->GetUnoGraphicsList() : NULL;
+    std::vector< VCLXGraphics* > *pLst = mpOutputDevice ? mpOutputDevice->GetUnoGraphicsList() : nullptr;
     if ( pLst )
     {
         for( std::vector< VCLXGraphics* >::iterator it = pLst->begin(); it != pLst->end(); ++it )
@@ -87,7 +87,7 @@ VCLXGraphics::~VCLXGraphics()
 void VCLXGraphics::SetOutputDevice( OutputDevice* pOutDev )
 {
     mpOutputDevice = pOutDev;
-    mxDevice = NULL;
+    mxDevice = nullptr;
     initAttrs();
 }
 
@@ -97,7 +97,7 @@ void VCLXGraphics::Init( OutputDevice* pOutDev )
     mpOutputDevice  = pOutDev;
 
     initAttrs();
-    mpClipRegion    = NULL;
+    mpClipRegion    = nullptr;
 
     // Register at OutputDevice
     std::vector< VCLXGraphics* > *pLst = mpOutputDevice->GetUnoGraphicsList();
@@ -236,7 +236,7 @@ void VCLXGraphics::setClipRegion( const uno::Reference< awt::XRegion >& rxRegion
     if ( rxRegion.is() )
         mpClipRegion = new vcl::Region( VCLUnoHelper::GetRegion( rxRegion ) );
     else
-        mpClipRegion = NULL;
+        mpClipRegion = nullptr;
 }
 
 void VCLXGraphics::intersectClipRegion( const uno::Reference< awt::XRegion >& rxRegion ) throw(uno::RuntimeException, std::exception)
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 4c6c20adb897..da2a79cd1f58 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -41,7 +41,7 @@
 VCLXMenu::VCLXMenu()
     : maMenuListeners( *this )
 {
-    mpMenu = NULL;
+    mpMenu = nullptr;
 }
 
 VCLXMenu::VCLXMenu( Menu* pMenu )
@@ -98,7 +98,7 @@ IMPL_LINK_TYPED( VCLXMenu, MenuEventListener, VclMenuEvent&, rMenuEvent, void )
             break;
             case VCLEVENT_OBJECT_DYING:
             {
-                mpMenu = NULL;
+                mpMenu = nullptr;
             }
             break;
             case VCLEVENT_MENU_HIGHLIGHT:
@@ -234,8 +234,8 @@ throw(css::uno::RuntimeException, std::exception)
     const bool bIsPopupMenu = IsPopupMenu();
     aGuard.clear();
 
-    static ::cppu::OTypeCollection* pCollectionMenuBar = NULL;
-    static ::cppu::OTypeCollection* pCollectionPopupMenu = NULL;
+    static ::cppu::OTypeCollection* pCollectionMenuBar = nullptr;
+    static ::cppu::OTypeCollection* pCollectionPopupMenu = nullptr;
 
     if ( bIsPopupMenu )
     {
@@ -437,7 +437,7 @@ throw(css::uno::RuntimeException, std::exception)
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     css::uno::Reference< css::awt::XPopupMenu >  aRef;
-    Menu* pMenu = mpMenu ? mpMenu->GetPopupMenu( nItemId ) : NULL;
+    Menu* pMenu = mpMenu ? mpMenu->GetPopupMenu( nItemId ) : nullptr;
     if ( pMenu )
     {
         for ( size_t n = maPopupMenuRefs.size(); n; )
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index 314dceb145e4..8d8f624d6e04 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -42,7 +42,7 @@
 
 css::beans::Property* ImplGetProperties( sal_uInt16& rElementCount )
 {
-    static css::beans::Property* pProperties = NULL;
+    static css::beans::Property* pProperties = nullptr;
     static sal_uInt16 nElements = 0;
     if( !pProperties )
     {
@@ -104,7 +104,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > VCLXPrinterPropertySet::getP
 
 ::cppu::IPropertyArrayHelper& VCLXPrinterPropertySet::getInfoHelper()
 {
-    static ::cppu::OPropertyArrayHelper* pPropertyArrayHelper = NULL;
+    static ::cppu::OPropertyArrayHelper* pPropertyArrayHelper = nullptr;
     if ( !pPropertyArrayHelper )
     {
         ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 2d295655d3a7..8af76d12b98a 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -117,7 +117,7 @@ sal_Bool SAL_CALL VCLXTabPageContainer::isTabPageActive( ::sal_Int16 tabPageInde
 
 Reference< css::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPage( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception)
 {
-    return (tabPageIndex >= 0 && tabPageIndex < static_cast<sal_Int16>(m_aTabPages.size())) ? m_aTabPages[tabPageIndex] : NULL;
+    return (tabPageIndex >= 0 && tabPageIndex < static_cast<sal_Int16>(m_aTabPages.size())) ? m_aTabPages[tabPageIndex] : nullptr;
 }
 
 Reference< css::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID ) throw (RuntimeException, std::exception)
@@ -160,7 +160,7 @@ void VCLXTabPageContainer::ProcessWindowEvent( const VclWindowEvent& _rVclWindow
             case VCLEVENT_TABPAGE_ACTIVATE:
             {
                 sal_uLong page = reinterpret_cast<sal_uLong>(_rVclWindowEvent.GetData());
-                awt::tab::TabPageActivatedEvent aEvent(NULL,page);
+                awt::tab::TabPageActivatedEvent aEvent(nullptr,page);
                 m_aTabPageListeners.tabPageActivated(aEvent);
                 break;
             }
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 10013ed8f633..a763df17b8ff 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -549,7 +549,7 @@ namespace
         { css::awt::MessageBoxType_WARNINGBOX,      RTL_CONSTASCII_STRINGPARAM("warningbox") },
         { css::awt::MessageBoxType_ERRORBOX,        RTL_CONSTASCII_STRINGPARAM("errorbox") },
         { css::awt::MessageBoxType_QUERYBOX,        RTL_CONSTASCII_STRINGPARAM("querybox") },
-        { css::awt::MessageBoxType_MAKE_FIXED_SIZE, 0, 0 }
+        { css::awt::MessageBoxType_MAKE_FIXED_SIZE, nullptr, 0 }
     };
 
     static bool lcl_convertMessageBoxType(
@@ -594,7 +594,7 @@ static osl::Mutex & getInitMutex()
 
 static osl::Condition & getInitCondition()
 {
-    static osl::Condition * pC = 0;
+    static osl::Condition * pC = nullptr;
     if( !pC )
     {
         osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
@@ -676,8 +676,8 @@ VCLXToolkit::VCLXToolkit():
     m_bEventListener(false),
     m_bKeyListener(false)
 {
-    hSvToolsLib = NULL;
-    fnSvtCreateWindow = NULL;
+    hSvToolsLib = nullptr;
+    fnSvtCreateWindow = nullptr;
 
     osl::Guard< osl::Mutex > aGuard( getInitMutex() );
     nVCLToolkitInstanceCount++;
@@ -700,8 +700,8 @@ void SAL_CALL VCLXToolkit::disposing()
     if ( hSvToolsLib )
     {
         osl_unloadModule( hSvToolsLib );
-        hSvToolsLib = NULL;
-        fnSvtCreateWindow = NULL;
+        hSvToolsLib = nullptr;
+        fnSvtCreateWindow = nullptr;
     }
 #endif
 
@@ -792,7 +792,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
     OUString aServiceName( rDescriptor.WindowServiceName );
     aServiceName = aServiceName.toAsciiLowerCase();
 
-    vcl::Window* pNewWindow = NULL;
+    vcl::Window* pNewWindow = nullptr;
     sal_uInt16 nType = ImplGetComponentType( aServiceName );
     bool bFrameControl = false;
     if ( aServiceName == "frame" )
@@ -827,8 +827,8 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
 
         if ( bException )
         {
-            *ppNewComp = NULL;
-            return NULL;
+            *ppNewComp = nullptr;
+            return nullptr;
         }
     }
 
@@ -954,7 +954,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
             case WINDOW_MODELESSDIALOG:
             {
                 // Modal/Modeless nur durch Show/Execute
-                if ( (pParent == NULL ) && ( rDescriptor.ParentIndex == -1 ) )
+                if ( (pParent == nullptr ) && ( rDescriptor.ParentIndex == -1 ) )
                     pNewWindow = VclPtr<toolkit::ScrollableWrapper<Dialog>>::Create( nullptr, nWinBits, Dialog::InitFlag::NoParent );
                 else
                     pNewWindow = VclPtr<toolkit::ScrollableWrapper<Dialog>>::Create( pParent, nWinBits );
@@ -1091,7 +1091,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                         pNewWindow = VclPtr<DockingWindow>::Create( pParent, nWinBits );
                     else
                     {
-                        if ((pParent == NULL) && rDescriptor.Parent.is())
+                        if ((pParent == nullptr) && rDescriptor.Parent.is())
                         {
                             // try to get a system dependent window handle
                             css::uno::Reference< css::awt::XSystemDependentWindowPeer > xSystemDepParent(rDescriptor.Parent, css::uno::UNO_QUERY);
@@ -1217,7 +1217,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
 
     css::uno::Reference< css::awt::XWindowPeer > xRef;
 
-    vcl::Window* pParent = NULL;
+    vcl::Window* pParent = nullptr;
     if ( rDescriptor.Parent.is() )
     {
         VCLXWindow* pParentComponent = VCLXWindow::GetImplementation( rDescriptor.Parent );
@@ -1232,9 +1232,9 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
         ImplGetComponentType( rDescriptor.WindowServiceName ) );
     nWinBits |= nForceWinBits;
 
-    VCLXWindow* pNewComp = NULL;
+    VCLXWindow* pNewComp = nullptr;
 
-    vcl::Window* pNewWindow = NULL;
+    vcl::Window* pNewWindow = nullptr;
     // Try to create the window with SvTools
     // (do this _before_ creating it on our own: The old mechanism (extended toolkit in SvTools) did it this way,
     // and we need to stay compatible)
@@ -1321,7 +1321,7 @@ css::uno::Sequence< css::uno::Reference< css::awt::XWindowPeer > > VCLXToolkit::
         css::awt::WindowDescriptor aDescr = rDescriptors.getConstArray()[n];
 
         if ( aDescr.ParentIndex == (-1) )
-            aDescr.Parent = NULL;
+            aDescr.Parent = nullptr;
         else if ( ( aDescr.ParentIndex >= 0 ) && ( aDescr.ParentIndex < (short)n ) )
             aDescr.Parent = aSeq.getConstArray()[aDescr.ParentIndex];
         aSeq.getArray()[n] = createWindow( aDescr );
@@ -1572,7 +1572,7 @@ VCLXToolkit::getTopWindow(::sal_Int32 nIndex)
     vcl::Window * p = ::Application::GetTopWindow(static_cast< long >(nIndex));
         // XXX  numeric overflow
     return css::uno::Reference< css::awt::XTopWindow >(
-        p == 0 ? 0 : static_cast< css::awt::XWindow * >(p->GetWindowPeer()),
+        p == nullptr ? nullptr : static_cast< css::awt::XWindow * >(p->GetWindowPeer()),
         css::uno::UNO_QUERY);
 }
 
@@ -1582,7 +1582,7 @@ VCLXToolkit::getActiveTopWindow() throw (css::uno::RuntimeException, std::except
 {
     vcl::Window * p = ::Application::GetActiveTopWindow();
     return css::uno::Reference< css::awt::XTopWindow >(
-        p == 0 ? 0 : static_cast< css::awt::XWindow * >(p->GetWindowPeer()),
+        p == nullptr ? nullptr : static_cast< css::awt::XWindow * >(p->GetWindowPeer()),
         css::uno::UNO_QUERY);
 }
 
@@ -1864,13 +1864,13 @@ void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent,
             // vclxwindow.cxx for mapping between VCL and UNO AWT event):
             css::uno::Reference< css::uno::XInterface > xNext;
             vcl::Window * pFocus = ::Application::GetFocusWindow();
-            for (vcl::Window * p = pFocus; p != 0; p = p->GetParent())
+            for (vcl::Window * p = pFocus; p != nullptr; p = p->GetParent())
                 if (!p->IsCompoundControl())
                 {
                     pFocus = p;
                     break;
                 }
-            if (pFocus != 0)
+            if (pFocus != nullptr)
                 xNext = pFocus->GetComponentInterface();
             css::awt::FocusEvent aAwtEvent(
                 static_cast< css::awt::XWindow * >(pWindow->GetWindowPeer()),
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index c46b8c27a978..967cb5f97e1b 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -151,7 +151,7 @@ void VCLXTopWindow_Base::setMenuBar( const css::uno::Reference< css::awt::XMenuB
     if ( pWindow )
     {
         SystemWindow* pSystemWindow = static_cast<SystemWindow*>( pWindow );
-        pSystemWindow->SetMenuBar( NULL );
+        pSystemWindow->SetMenuBar( nullptr );
         if ( rxMenu.is() )
         {
             VCLXMenu* pMenu = VCLXMenu::GetImplementation( rxMenu );
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 0432b7c6e60a..a1f4bb3ac7ad 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -210,7 +210,7 @@ VCLXWindowImpl::VCLXWindowImpl( VCLXWindow& _rAntiImpl, bool _bWithDefaultProps
     ,maPaintListeners( _rAntiImpl )
     ,maContainerListeners( _rAntiImpl )
     ,maTopWindowListeners( _rAntiImpl )
-    ,mnCallbackEventId( 0 )
+    ,mnCallbackEventId( nullptr )
     ,mbDisposing( false )
     ,mbDesignMode( false )
     ,mbSynthesizingVCLEvent( false )
@@ -218,7 +218,7 @@ VCLXWindowImpl::VCLXWindowImpl( VCLXWindow& _rAntiImpl, bool _bWithDefaultProps
     ,mnListenerLockLevel( 0 )
     ,mnWritingMode( WritingMode2::CONTEXT )
     ,mnContextWritingMode( WritingMode2::CONTEXT )
-    ,mpPropHelper( NULL )
+    ,mpPropHelper( nullptr )
 {
 }
 
@@ -233,7 +233,7 @@ void VCLXWindowImpl::disposing()
     SolarMutexGuard aGuard;
     if ( mnCallbackEventId )
         Application::RemoveUserEvent( mnCallbackEventId );
-    mnCallbackEventId = 0;
+    mnCallbackEventId = nullptr;
 
     mbDisposed= true;
 
@@ -252,7 +252,7 @@ void VCLXWindowImpl::disposing()
     maTopWindowListeners.disposeAndClear( aEvent );
 
     ::toolkit::WindowStyleSettings* pStyleSettings = static_cast< ::toolkit::WindowStyleSettings* >( mxWindowStyleSettings.get() );
-    if ( pStyleSettings != NULL )
+    if ( pStyleSettings != nullptr )
         pStyleSettings->dispose();
     mxWindowStyleSettings.clear();
 }
@@ -289,7 +289,7 @@ IMPL_LINK_NOARG_TYPED(VCLXWindowImpl, OnProcessCallbacks, void*, void)
             // we were disposed while waiting for the mutex to lock
             return;
 
-        mnCallbackEventId = 0;
+        mnCallbackEventId = nullptr;
     }
 
     {
@@ -334,7 +334,7 @@ void ImplInitWindowEvent( css::awt::WindowEvent& rEvent, vcl::Window* pWindow )
 }
 
 VCLXWindow::VCLXWindow( bool _bWithDefaultProps )
-    :mpImpl( NULL )
+    :mpImpl( nullptr )
 {
     mpImpl = new VCLXWindowImpl( *this, _bWithDefaultProps );
 }
@@ -346,8 +346,8 @@ VCLXWindow::~VCLXWindow()
     if ( GetWindow() )
     {
         GetWindow()->RemoveEventListener( LINK( this, VCLXWindow, WindowEventListener ) );
-        GetWindow()->SetWindowPeer( NULL, NULL );
-        GetWindow()->SetAccessible( NULL );
+        GetWindow()->SetWindowPeer( nullptr, nullptr );
+        GetWindow()->SetAccessible( nullptr );
     }
 }
 
@@ -910,7 +910,7 @@ const css::uno::Sequence< sal_Int8 >& VCLXWindow::GetUnoTunnelId() throw()
 VCLXWindow* VCLXWindow::GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace )
 {
     css::uno::Reference< css::lang::XUnoTunnel > xUT( rxIFace, css::uno::UNO_QUERY );
-    return xUT.is() ? reinterpret_cast<VCLXWindow*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( VCLXWindow::GetUnoTunnelId() ))) : NULL;
+    return xUT.is() ? reinterpret_cast<VCLXWindow*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( VCLXWindow::GetUnoTunnelId() ))) : nullptr;
 }
 
 
@@ -921,7 +921,7 @@ void VCLXWindow::dispose(  ) throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    mpImpl->mxViewGraphics = NULL;
+    mpImpl->mxViewGraphics = nullptr;
 
     if ( !mpImpl->mbDisposing )
     {
@@ -932,8 +932,8 @@ void VCLXWindow::dispose(  ) throw(css::uno::RuntimeException, std::exception)
         if ( GetWindow() )
         {
             VclPtr<OutputDevice> pOutDev = GetOutputDevice();
-            SetWindow( NULL );  // so that handlers are logged off, if necessary (virtual)
-            SetOutputDevice( NULL );
+            SetWindow( nullptr );  // so that handlers are logged off, if necessary (virtual)
+            SetOutputDevice( nullptr );
             pOutDev.disposeAndClear();
         }
 
@@ -2214,7 +2214,7 @@ sal_Bool VCLXWindow::setGraphics( const css::uno::Reference< css::awt::XGraphics
     if ( VCLUnoHelper::GetOutputDevice( rxDevice ) )
         mpImpl->mxViewGraphics = rxDevice;
     else
-        mpImpl->mxViewGraphics = NULL;
+        mpImpl->mxViewGraphics = nullptr;
 
     return mpImpl->mxViewGraphics.is();
 }
@@ -2312,7 +2312,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeExcep
             vcl::PDFExtOutDevData* pPDFExport   = dynamic_cast<vcl::PDFExtOutDevData*>(pDev->GetExtOutDevData());
             bool bDrawSimple =    ( pDev->GetOutDevType() == OUTDEV_PRINTER )
                                || ( pDev->GetOutDevViewType() == OUTDEV_VIEWTYPE_PRINTPREVIEW )
-                               || ( pPDFExport != NULL );
+                               || ( pPDFExport != nullptr );
             if ( bDrawSimple )
             {
                 pWindow->Draw( pDev, aP, aSz, DrawFlags::NoControls );
@@ -2482,7 +2482,7 @@ void SAL_CALL VCLXWindow::setOutputSize( const css::awt::Size& aSize ) throw (cs
 {
     SolarMutexGuard aGuard;
     vcl::Window *pWindow;
-    if( (pWindow = GetWindow()) != NULL )
+    if( (pWindow = GetWindow()) != nullptr )
     {
         DockingWindow *pDockingWindow = dynamic_cast< DockingWindow* >(pWindow);
         if( pDockingWindow )
@@ -2496,7 +2496,7 @@ css::awt::Size SAL_CALL VCLXWindow::getOutputSize(  ) throw (css::uno::RuntimeEx
 {
     SolarMutexGuard aGuard;
     vcl::Window *pWindow;
-    if( (pWindow = GetWindow()) != NULL )
+    if( (pWindow = GetWindow()) != nullptr )
     {
         DockingWindow *pDockingWindow = dynamic_cast< DockingWindow* >(pWindow);
         if( pDockingWindow )
@@ -2551,7 +2551,7 @@ UnoPropertyArrayHelper *
 VCLXWindow::GetPropHelper()
 {
     SolarMutexGuard aGuard;
-    if ( mpImpl->mpPropHelper == NULL )
+    if ( mpImpl->mpPropHelper == nullptr )
     {
         std::list< sal_uInt16 > aIDs;
         GetPropertyIds( aIDs );
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 76c0559a8329..fe3d05b455a4 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2313,8 +2313,8 @@ sal_Int16 VCLXDialog::execute() throw(css::uno::RuntimeException, std::exception
     {
         VclPtr< Dialog > pDlg = GetAs< Dialog >();
         vcl::Window* pParent = pDlg->GetWindow( GetWindowType::ParentOverlap );
-        vcl::Window* pOldParent = NULL;
-        vcl::Window* pSetParent = NULL;
+        vcl::Window* pOldParent = nullptr;
+        vcl::Window* pSetParent = nullptr;
         if ( pParent && !pParent->IsReallyVisible() )
         {
             pOldParent = pDlg->GetParent();
@@ -2606,7 +2606,7 @@ sal_uInt16 VCLXMultiPage::insertTab( TabPage* pPage, OUString& sTitle )
 void SAL_CALL VCLXMultiPage::removeTab( sal_Int32 ID ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     TabControl *pTabControl = getTabControl();
-    if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == NULL )
+    if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == nullptr )
         throw lang::IndexOutOfBoundsException();
     pTabControl->RemovePage( sal::static_int_cast< sal_uInt16 >( ID ) );
 }
@@ -2618,7 +2618,7 @@ void SAL_CALL VCLXMultiPage::activateTab( sal_Int32 ID ) throw (uno::RuntimeExce
         "toolkit",
         "Attempting to activate tab " << ID << ", active tab is "
             << getActiveTabID() << ", numtabs is " << getWindows().getLength());
-    if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == NULL )
+    if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == nullptr )
         throw lang::IndexOutOfBoundsException();
     pTabControl->SelectTabPage( sal::static_int_cast< sal_uInt16 >( ID ) );
 }
@@ -2644,7 +2644,7 @@ void SAL_CALL VCLXMultiPage::setTabProps( sal_Int32 ID, const uno::Sequence< bea
 {
     SolarMutexGuard aGuard;
     TabControl *pTabControl = getTabControl();
-    if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == NULL )
+    if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == nullptr )
         throw lang::IndexOutOfBoundsException();
 
     for (sal_Int32 i = 0; i < Properties.getLength(); ++i)
@@ -2665,7 +2665,7 @@ uno::Sequence< beans::NamedValue > SAL_CALL VCLXMultiPage::getTabProps( sal_Int3
 {
     SolarMutexGuard aGuard;
     TabControl *pTabControl = getTabControl();
-    if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == NULL )
+    if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == nullptr )
         throw lang::IndexOutOfBoundsException();
 
     uno::Sequence< beans::NamedValue > props
@@ -4626,7 +4626,7 @@ void VCLXFormattedSpinField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 }
 
 VCLXFormattedSpinField::VCLXFormattedSpinField()
-    : mpFormatter(NULL)
+    : mpFormatter(nullptr)
 {
 }
 
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index 3c23acff6f89..33e99cebdd3e 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -86,7 +86,7 @@ namespace toolkit
 
     OAccessibleControlContext* OAccessibleControlContext::create( const Reference< XAccessible >& _rxCreator )
     {
-        OAccessibleControlContext* pNew = NULL;
+        OAccessibleControlContext* pNew = nullptr;
         try
         {
             pNew = new OAccessibleControlContext;
@@ -164,7 +164,7 @@ namespace toolkit
 
     Reference< XAccessibleRelationSet > SAL_CALL OAccessibleControlContext::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
     {
-        return NULL;
+        return nullptr;
     }
 
 
@@ -173,7 +173,7 @@ namespace toolkit
         ::osl::MutexGuard aGuard( GetMutex() );
             // no OContextEntryGuard here, as we do not want to throw an exception in case we're not alive anymore
 
-        ::utl::AccessibleStateSetHelper* pStateSet = NULL;
+        ::utl::AccessibleStateSetHelper* pStateSet = nullptr;
         if ( isAlive() )
         {
             // no own states, only the ones which are foreign controlled
@@ -264,7 +264,7 @@ namespace toolkit
             // ugly, but .... though the XWindow has a getPosSize, it is impossible to determine the
             // parent which this position/size is relative to. This means we must tunnel UNO and ask the
             // implementation
-            vcl::Window* pVCLParent = pVCLWindow ? pVCLWindow->GetParent() : NULL;
+            vcl::Window* pVCLParent = pVCLWindow ? pVCLWindow->GetParent() : nullptr;
 
             // the relative location of the window
             ::Point aWindowRelativePos( 0, 0);
@@ -300,7 +300,7 @@ namespace toolkit
     Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleAtPoint( const awt::Point& /* _rPoint */ ) throw (RuntimeException, std::exception)
     {
         // no children at all
-        return NULL;
+        return nullptr;
     }
 
 
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index 55df02f25af3..aa45bdaabcca 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -226,7 +226,7 @@ namespace toolkit {
             const sal_Int32 i_accessor, const Sequence< OUString >& i_imageURLs, const Reference< XInterface >& i_context )
         {
             ::cppu::OInterfaceContainerHelper* pContainerListeners = i_broadcaseHelper.getContainer( cppu::UnoType<XContainerListener>::get() );
-            if ( pContainerListeners == NULL )
+            if ( pContainerListeners == nullptr )
                 return;
 
             ContainerEvent aEvent;
@@ -351,7 +351,7 @@ namespace toolkit {
 
     ::cppu::IPropertyArrayHelper& SAL_CALL AnimatedImagesControlModel::getInfoHelper()
     {
-        static UnoPropertyArrayHelper* pHelper = NULL;
+        static UnoPropertyArrayHelper* pHelper = nullptr;
         if ( !pHelper )
         {
             Sequence< sal_Int32 > aIDs = ImplGetPropertyIds();
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 0e615ec2c5fe..6269f38fd3c3 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -249,7 +249,7 @@ Any ControlModelContainerBase::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
 ::cppu::IPropertyArrayHelper& ControlModelContainerBase::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
@@ -328,7 +328,7 @@ Reference< XInterface > ControlModelContainerBase::createInstance( const OUStrin
 {
     SolarMutexGuard aGuard;
 
-    OGeometryControlModel_Base* pNewModel = NULL;
+    OGeometryControlModel_Base* pNewModel = nullptr;
 
     if ( aServiceSpecifier == "com.sun.star.awt.UnoControlEditModel" )
         pNewModel = new OGeometryControlModel< UnoControlEditModel >( m_xContext );
@@ -422,7 +422,7 @@ Reference< XInterface > ControlModelContainerBase::createInstanceWithArguments(
 
 Sequence< OUString > ControlModelContainerBase::getAvailableServiceNames() throw(RuntimeException, std::exception)
 {
-    static Sequence< OUString >* pNamesSeq = NULL;
+    static Sequence< OUString >* pNamesSeq = nullptr;
     if ( !pNamesSeq )
     {
         pNamesSeq = new Sequence< OUString >( 26 );
@@ -1498,7 +1498,7 @@ sal_Bool ControlContainerBase::setModel( const Reference< XControlModel >& rxMod
     // destroy the old tab controller, if existent
     if ( mxTabController.is() )
     {
-        mxTabController->setModel( NULL );                  // just to be sure, should not be necessary
+        mxTabController->setModel( nullptr );                  // just to be sure, should not be necessary
         removeTabController( mxTabController );
         ::comphelper::disposeComponent( mxTabController );  // just to be sure, should not be necessary
         mxTabController.clear();
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 48b5db568b88..e46281434897 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -277,7 +277,7 @@ Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
 ::cppu::IPropertyArrayHelper& UnoControlDialogModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
@@ -824,7 +824,7 @@ void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >& _rxCo
     uno::Reference< beans::XPropertySet > xProps( _rxControl->getModel(), uno::UNO_QUERY );
 
    VCLXTabPage* pXPage = dynamic_cast< VCLXTabPage* >( xPage.get() );
-   TabPage* pPage = pXPage ? pXPage->getTabPage() : NULL;
+   TabPage* pPage = pXPage ? pXPage->getTabPage() : nullptr;
     if ( xTabCntrl.is() && pPage )
     {
         VCLXMultiPage* pXTab = dynamic_cast< VCLXMultiPage* >( xTabCntrl.get() );
@@ -873,7 +873,7 @@ void    UnoMultiPageControl::impl_createControlPeerIfNecessary( const uno::Refer
 
     if( xMyPeer.is() )
     {
-        _rxControl->createPeer( NULL, xMyPeer );
+        _rxControl->createPeer( nullptr, xMyPeer );
         bindPage( _rxControl );
         ImplActivateTabControllers();
     }
@@ -946,7 +946,7 @@ uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
 ::cppu::IPropertyArrayHelper& UnoMultiPageModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -1066,7 +1066,7 @@ uno::Any UnoPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
 ::cppu::IPropertyArrayHelper& UnoPageModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>  aIDs = ImplGetPropertyIds();
@@ -1245,7 +1245,7 @@ uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
 ::cppu::IPropertyArrayHelper& UnoFrameModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index 5cd650da2d6b..8a567b27fa3b 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -401,7 +401,7 @@ namespace toolkit
 
     ::cppu::IPropertyArrayHelper& UnoControlFormattedFieldModel::getInfoHelper()
     {
-        static UnoPropertyArrayHelper* pHelper = NULL;
+        static UnoPropertyArrayHelper* pHelper = nullptr;
         if ( !pHelper )
         {
             Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 600c8d81930e..c0707d1d97ea 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -81,7 +81,7 @@
         ,m_nStep(0)
         ,m_bCloneable(false)
     {
-        OSL_ENSURE(NULL != _pAggregateInstance, "OGeometryControlModel_Base::OGeometryControlModel_Base: invalid aggregate!");
+        OSL_ENSURE(nullptr != _pAggregateInstance, "OGeometryControlModel_Base::OGeometryControlModel_Base: invalid aggregate!");
 
         osl_atomic_increment(&m_refCount);
         {
@@ -291,8 +291,8 @@
     {
         // release the aggregate (_before_ clearing m_xAggregate)
         if (m_xAggregate.is())
-            m_xAggregate->setDelegator(NULL);
-        setAggregation(NULL);
+            m_xAggregate->setDelegator(nullptr);
+        setAggregation(nullptr);
     }
 
 
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 8de9356bffd0..41d95d5f8824 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -114,7 +114,7 @@ private:
                 Reference< XGridColumn > const xClone( xCloneable->createClone(), UNO_QUERY_THROW );
 
                 GridColumn* const pGridColumn = GridColumn::getImplementation( xClone );
-                if ( pGridColumn == NULL )
+                if ( pGridColumn == nullptr )
                     throw RuntimeException( "invalid clone source implementation", *this );
                     // that's indeed a RuntimeException, not an IllegalArgumentException or some such:
                     // a DefaultGridColumnModel implementation whose columns are not GridColumn implementations
@@ -157,7 +157,7 @@ private:
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
         GridColumn* const pGridColumn = GridColumn::getImplementation( i_column );
-        if ( pGridColumn == NULL )
+        if ( pGridColumn == nullptr )
             throw css::lang::IllegalArgumentException( "invalid column implementation", *this, 1 );
 
         m_aColumns.push_back( i_column );
diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx
index 39eaa564c270..90f79dae8fa8 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.cxx
@@ -305,7 +305,7 @@ namespace toolkit
         Reference< XUnoTunnel > const xTunnel( i_component, UNO_QUERY );
         if ( xTunnel.is() )
             return reinterpret_cast< GridColumn* >( ::sal::static_int_cast< sal_IntPtr >( xTunnel->getSomething( getUnoTunnelId() ) ) );
-        return NULL;
+        return nullptr;
     }
 }
 
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 3fb05f95790c..a3991bcfb2c4 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -251,7 +251,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
 ::cppu::IPropertyArrayHelper& UnoGridModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 7de6d318ce9e..e8809a16d2a1 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -345,7 +345,7 @@ private:
             GridDataEvent const & i_publicEvent, MethodGuard& i_instanceLock )
     {
         ::cppu::OInterfaceContainerHelper* pListeners = rBHelper.getContainer( cppu::UnoType<XGridDataListener>::get() );
-        if ( pListeners == NULL )
+        if ( pListeners == nullptr )
             return;
 
         i_instanceLock.clear();
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 139d2fdaef94..4b13004d243d 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -160,7 +160,7 @@ static void lcl_throwIndexOutOfBoundsException( )
 
     ::cppu::IPropertyArrayHelper& UnoControlRoadmapModel::getInfoHelper()
     {
-        static UnoPropertyArrayHelper* pHelper = NULL;
+        static UnoPropertyArrayHelper* pHelper = nullptr;
         if ( !pHelper )
         {
             Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index e6a5387a7318..d4ecae320b20 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -89,7 +89,7 @@ bool StdTabController::ImplCreateComponentSequence(
     sal_uInt32 nCtrls = rControls.getLength();
     rComponents.realloc( nCtrls );
     Reference< XWindow > * pComps = rComponents.getArray();
-    Any* pTabs = NULL;
+    Any* pTabs = nullptr;
 
 
     if ( pTabStops )
@@ -247,7 +247,7 @@ void StdTabController::autoTabOrder(  ) throw(RuntimeException, std::exception)
 
     // #58317# Some Models may be missing from the Container. Plus there is a
     // autoTabOrder call later on.
-    if( !ImplCreateComponentSequence( aControls, aSeq, aCompSeq, NULL, false ) )
+    if( !ImplCreateComponentSequence( aControls, aSeq, aCompSeq, nullptr, false ) )
         return;
 
     sal_uInt32 nCtrls = aCompSeq.getLength();
@@ -345,7 +345,7 @@ void StdTabController::activateTabOrder(  ) throw(RuntimeException, std::excepti
 
         aControlComponents.realloc( 0 );
 
-        ImplCreateComponentSequence( aControls, aThisGroupModels, aControlComponents, NULL, true );
+        ImplCreateComponentSequence( aControls, aThisGroupModels, aControlComponents, nullptr, true );
         xVclContainerPeer->setGroup( aControlComponents );
     }
 }
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index 139307a2822c..f9c0f9c0d154 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@@ -70,7 +70,7 @@ size_t  UnoControlModelEntryList::size() const {
 }
 
 UnoControlModelEntry* UnoControlModelEntryList::operator[]( size_t i ) const {
-    return ( i < maList.size() ) ? maList[ i ] : NULL;
+    return ( i < maList.size() ) ? maList[ i ] : nullptr;
 }
 
 void UnoControlModelEntryList::push_back( UnoControlModelEntry* item ) {
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index 68cbdda95621..58c3fe4ff400 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -81,7 +81,7 @@ uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropI
 
 ::cppu::IPropertyArrayHelper& UnoControlTabPageContainerModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         css::uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -125,7 +125,7 @@ namespace
         {
             DBG_UNHANDLED_EXCEPTION();
         }
-        return NULL;
+        return nullptr;
     }
 }
 
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index 175f06392324..fe86a22c3882 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -95,7 +95,7 @@ Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
 ::cppu::IPropertyArrayHelper& UnoControlTabPageModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index b08216cb2d8a..150f911a1cf4 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -83,7 +83,7 @@ namespace toolkit
 
     ::cppu::IPropertyArrayHelper& UnoControlScrollBarModel::getInfoHelper()
     {
-        static UnoPropertyArrayHelper* pHelper = NULL;
+        static UnoPropertyArrayHelper* pHelper = nullptr;
         if ( !pHelper )
         {
             uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index 7f46bc83c3b5..47263967c2c9 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -170,7 +170,7 @@ public:
 
     ::cppu::IPropertyArrayHelper& UnoSpinButtonModel::getInfoHelper()
     {
-        static UnoPropertyArrayHelper* pHelper = NULL;
+        static UnoPropertyArrayHelper* pHelper = nullptr;
         if ( !pHelper )
         {
             Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index 70196f6ccb5f..ffc9109822e8 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -93,7 +93,7 @@ Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     case BASEPROPERTY_ROW_HEIGHT:
         return Any( sal_Int32( 0 ) );
     case BASEPROPERTY_TREE_DATAMODEL:
-        return Any( Reference< XTreeDataModel >( 0 ) );
+        return Any( Reference< XTreeDataModel >( nullptr ) );
     case BASEPROPERTY_TREE_EDITABLE:
     case BASEPROPERTY_TREE_INVOKESSTOPNODEEDITING:
         return Any( sal_False );
@@ -110,7 +110,7 @@ Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
 ::cppu::IPropertyArrayHelper& UnoTreeModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index ad9a9031909a..b0a0c20630cf 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -266,7 +266,7 @@ Sequence< OUString > SAL_CALL MutableTreeDataModel::getSupportedServiceNames(  )
 MutableTreeNode::MutableTreeNode( const MutableTreeDataModelRef& xModel, const Any& rValue, bool bChildrenOnDemand )
 : maDisplayValue( rValue )
 , mbHasChildrenOnDemand( bChildrenOnDemand )
-, mpParent( 0 )
+, mpParent( nullptr )
 , mxModel( xModel )
 , mbIsInserted( false )
 {
@@ -276,7 +276,7 @@ MutableTreeNode::~MutableTreeNode()
 {
     TreeNodeVector::iterator aIter( maChildren.begin() );
     while( aIter != maChildren.end() )
-        (*aIter++)->setParent(0);
+        (*aIter++)->setParent(nullptr);
 }
 
 void MutableTreeNode::setParent( MutableTreeNode* pParent )
@@ -382,7 +382,7 @@ void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) throw
     if( !xImpl.is() )
         throw IndexOutOfBoundsException();
 
-    xImpl->setParent(0);
+    xImpl->setParent(nullptr);
     xImpl->mbIsInserted = false;
 
     broadcast_changes( getReference( xImpl.get() ), false );
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 0cf63e514010..050b0aa61ed9 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -73,7 +73,7 @@ static const LanguageDependentProp aLanguageDependentProp[] =
     { "HelpText",        8 },
     { "CurrencySymbol", 14 },
     { "StringItemList", 14 },
-    { 0, 0                 }
+    { nullptr, 0                 }
 };
 
 static Sequence< OUString> lcl_ImplGetPropertyNames( const Reference< XMultiPropertySet > & rxModel )
@@ -175,21 +175,21 @@ Reference< XWindowPeer >    UnoControl::ImplGetCompatiblePeer( bool bAcceptExist
             maComponentInfos.bVisible = false;
 
         Reference< XWindowPeer >    xCurrentPeer = getPeer();
-        setPeer( NULL );
+        setPeer( nullptr );
 
         // queryInterface ourself, to allow aggregation
         Reference< XControl > xMe;
         OWeakAggObject::queryInterface( cppu::UnoType<decltype(xMe)>::get() ) >>= xMe;
 
-        vcl::Window* pParentWindow( NULL );
+        vcl::Window* pParentWindow( nullptr );
         {
             SolarMutexGuard aGuard;
             pParentWindow = dynamic_cast< vcl::Window* >( Application::GetDefaultDevice() );
-            ENSURE_OR_THROW( pParentWindow != NULL, "could obtain a default parent window!" );
+            ENSURE_OR_THROW( pParentWindow != nullptr, "could obtain a default parent window!" );
         }
         try
         {
-            xMe->createPeer( NULL, pParentWindow->GetComponentInterface() );
+            xMe->createPeer( nullptr, pParentWindow->GetComponentInterface() );
         }
         catch( const Exception& )
         {
@@ -353,7 +353,7 @@ void UnoControl::dispose(  ) throw(RuntimeException, std::exception)
         {
             xPeer = mxPeer;
         }
-        setPeer( NULL );
+        setPeer( nullptr );
         xAccessibleComp.set(maAccessibleContext, UNO_QUERY);
         maAccessibleContext.clear();
     }
@@ -585,7 +585,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
             // Our resource resolver has been changed and we must be sure
             // that language dependent props use the new resolver.
             const LanguageDependentProp* pLangDepProp = aLanguageDependentProp;
-            while ( pLangDepProp->pPropName != 0 )
+            while ( pLangDepProp->pPropName != nullptr )
             {
                 bool bMustBeInserted( true );
                 for ( size_t i = 0; i < aPeerPropertiesToSet.size(); i++ )
@@ -626,7 +626,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
             // Doesn't work for Container!
             getPeer()->dispose();
             mxPeer.clear();
-            mxVclWindowPeer = NULL;
+            mxVclWindowPeer = nullptr;
             mbRefeshingPeer = true;
             Reference< XWindowPeer >    xP( xParent, UNO_QUERY );
             xThis->createPeer( Reference< XToolkit > (), xP );
@@ -644,7 +644,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
         {
             SolarMutexGuard g;
             vcl::Window* pVclPeer = VCLUnoHelper::GetWindow( getPeer() );
-            pPeer = pVclPeer ? pVclPeer->GetWindowPeer() : NULL;
+            pPeer = pVclPeer ? pVclPeer->GetWindowPeer() : nullptr;
         }
         VclListenerLock aNoVclEventMultiplexing( pPeer );
 
@@ -670,7 +670,7 @@ void UnoControl::disposing( const EventObject& rEvt ) throw(RuntimeException, st
     if ( maAccessibleContext.get() == rEvt.Source )
     {
         // just in case the context is disposed, but not released - ensure that we do not re-use it in the future
-        maAccessibleContext = NULL;
+        maAccessibleContext = nullptr;
     }
     else if( mxModel.get() == Reference< XControlModel >(rEvt.Source,UNO_QUERY).get() )
     {
@@ -1559,7 +1559,7 @@ uno::Reference< awt::XStyleSettings > SAL_CALL UnoControl::getStyleSettings() th
     }
     if ( xPeerSupplier.is() )
         return xPeerSupplier->getStyleSettings();
-    return NULL;
+    return nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 5cc00ea55ff3..895cc79d4aa5 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -510,7 +510,7 @@ void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier
             *this
         );
 
-    impl_removeControl( _nIdentifier, xControl, NULL );
+    impl_removeControl( _nIdentifier, xControl, nullptr );
 }
 
 void SAL_CALL UnoControlContainer::replaceByIdentifer( ::sal_Int32 _nIdentifier, const uno::Any& _rElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
@@ -628,7 +628,7 @@ void UnoControlContainer::impl_createControlPeerIfNecessary( const uno::Referenc
 
     if( xMyPeer.is() )
     {
-        _rxControl->createPeer( NULL, xMyPeer );
+        _rxControl->createPeer( nullptr, xMyPeer );
         ImplActivateTabControllers();
     }
 
@@ -666,7 +666,7 @@ void UnoControlContainer::removingControl( const uno::Reference< awt::XControl >
     if ( _rxControl.is() )
     {
         _rxControl->removeEventListener( this );
-        _rxControl->setContext( NULL );
+        _rxControl->setContext( nullptr );
     }
 }
 
@@ -701,7 +701,7 @@ void UnoControlContainer::removeControl( const uno::Reference< awt::XControl >&
 
         UnoControlHolderList::ControlIdentifier id = mpControls->getControlIdentifier( _rxControl );
         if ( id != -1 )
-            impl_removeControl( id, _rxControl, NULL );
+            impl_removeControl( id, _rxControl, nullptr );
     }
 }
 
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index 864a07738cf1..9198e8f7f0ad 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -83,7 +83,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > UnoControlContainerModel::ge
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         css::uno::Sequence<sal_Int32>  aIDs = ImplGetPropertyIds();
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 75add058c1d3..8a0f22a31dd9 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -772,7 +772,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre
     // No data for the model may be added following the properties
 
     // Used for import of old parts in css::awt::FontDescriptor
-    css::awt::FontDescriptor* pFD = NULL;
+    css::awt::FontDescriptor* pFD = nullptr;
 
     sal_uInt32 i;
     for ( i = 0; i < nProps; i++ )
@@ -1125,7 +1125,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any &
                             if ( xPure.is() )
                                 rConvertedValue = xPure->queryInterface( *pDestType );
                             else
-                                rConvertedValue.setValue( NULL, *pDestType );
+                                rConvertedValue.setValue( nullptr, *pDestType );
                             bConverted = true;
                         }
                     }
@@ -1171,7 +1171,7 @@ void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const
     // Missing: the fake solo properties of the FontDescriptor
 
     ImplPropertyTable::const_iterator it = maData.find( nPropId );
-    const css::uno::Any* pProp = it == maData.end() ? NULL : &(it->second);
+    const css::uno::Any* pProp = it == maData.end() ? nullptr : &(it->second);
     ENSURE_OR_RETURN_VOID( pProp, "UnoControlModel::setFastPropertyValue_NoBroadcast: invalid property id!" );
 
     DBG_ASSERT( ( rValue.getValueType().getTypeClass() != css::uno::TypeClass_VOID ) || ( GetPropertyAttribs( (sal_uInt16)nPropId ) & css::beans::PropertyAttribute::MAYBEVOID ), "Property darf nicht VOID sein!" );
@@ -1183,7 +1183,7 @@ void UnoControlModel::getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nPr
     ::osl::Guard< ::osl::Mutex > aGuard( const_cast<UnoControlModel*>(this)->GetMutex() );
 
     ImplPropertyTable::const_iterator it = maData.find( nPropId );
-    const css::uno::Any* pProp = it == maData.end() ? NULL : &(it->second);
+    const css::uno::Any* pProp = it == maData.end() ? nullptr : &(it->second);
 
     if ( pProp )
         rValue = *pProp;
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 2e691041a740..226be956dd14 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -81,7 +81,7 @@ ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( uno::Reference< graphic:
         xOutGraphicObj = graphic::GraphicObject::createWithId( ::comphelper::getProcessComponentContext(), sID );
     }
     else // linked
-        xOutGraphicObj = NULL; // release the GraphicObject
+        xOutGraphicObj = nullptr; // release the GraphicObject
 
     return ImageHelper::getGraphicFromURL_nothrow( _rURL );
 }
@@ -144,7 +144,7 @@ uno::Any UnoControlEditModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
 ::cppu::IPropertyArrayHelper& UnoControlEditModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -555,7 +555,7 @@ uno::Any UnoControlFileControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
 
 ::cppu::IPropertyArrayHelper& UnoControlFileControlModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -745,7 +745,7 @@ uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
 ::cppu::IPropertyArrayHelper& UnoControlButtonModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -996,7 +996,7 @@ uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId )
 
 ::cppu::IPropertyArrayHelper& UnoControlImageControlModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -1159,7 +1159,7 @@ uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
 
 ::cppu::IPropertyArrayHelper& UnoControlRadioButtonModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -1416,7 +1416,7 @@ uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
 
 ::cppu::IPropertyArrayHelper& UnoControlCheckBoxModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -1657,7 +1657,7 @@ uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId
 
 ::cppu::IPropertyArrayHelper& UnoControlFixedHyperlinkModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -1854,7 +1854,7 @@ uno::Any UnoControlFixedTextModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
 
 ::cppu::IPropertyArrayHelper& UnoControlFixedTextModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -2036,7 +2036,7 @@ uno::Any UnoControlGroupBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
 
 ::cppu::IPropertyArrayHelper& UnoControlGroupBoxModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -2284,7 +2284,7 @@ uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
 ::cppu::IPropertyArrayHelper& UnoControlListBoxModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -3169,7 +3169,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySe
 
 ::cppu::IPropertyArrayHelper& UnoControlComboBoxModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -3690,7 +3690,7 @@ uno::Any UnoControlDateFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
 
 ::cppu::IPropertyArrayHelper& UnoControlDateFieldModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -3979,7 +3979,7 @@ uno::Any UnoControlTimeFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
 
 ::cppu::IPropertyArrayHelper& UnoControlTimeFieldModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -4227,7 +4227,7 @@ uno::Any UnoControlNumericFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
 
 ::cppu::IPropertyArrayHelper& UnoControlNumericFieldModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -4478,7 +4478,7 @@ uno::Any UnoControlCurrencyFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
 
 ::cppu::IPropertyArrayHelper& UnoControlCurrencyFieldModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -4722,7 +4722,7 @@ uno::Any UnoControlPatternFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
 
 ::cppu::IPropertyArrayHelper& UnoControlPatternFieldModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -4916,7 +4916,7 @@ uno::Any UnoControlProgressBarModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
 
 ::cppu::IPropertyArrayHelper& UnoControlProgressBarModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
@@ -5093,7 +5093,7 @@ uno::Any UnoControlFixedLineModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
 
 ::cppu::IPropertyArrayHelper& UnoControlFixedLineModel::getInfoHelper()
 {
-    static UnoPropertyArrayHelper* pHelper = NULL;
+    static UnoPropertyArrayHelper* pHelper = nullptr;
     if ( !pHelper )
     {
         uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index 4433f280e01f..7be84b29a9fc 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -39,10 +39,10 @@ namespace toolkit
     namespace
     {
 #ifndef DISABLE_DYNLOADING
-        static oslModule                                s_hAccessibleImplementationModule = NULL;
+        static oslModule                                s_hAccessibleImplementationModule = nullptr;
 #endif
 #if HAVE_FEATURE_DESKTOP
-        static GetStandardAccComponentFactory           s_pAccessibleFactoryFunc = NULL;
+        static GetStandardAccComponentFactory           s_pAccessibleFactoryFunc = nullptr;
 #endif
         static ::rtl::Reference< IAccessibleFactory >   s_pFactory;
     }
@@ -64,62 +64,62 @@ namespace toolkit
         css::uno::Reference< css::accessibility::XAccessibleContext >
                 createAccessibleContext( VCLXButton* /*_pXWindow*/ ) override
         {
-            return NULL;
+            return nullptr;
         }
         css::uno::Reference< css::accessibility::XAccessibleContext >
                 createAccessibleContext( VCLXCheckBox* /*_pXWindow*/ ) override
         {
-            return NULL;
+            return nullptr;
         }
         css::uno::Reference< css::accessibility::XAccessibleContext >
                 createAccessibleContext( VCLXRadioButton* /*_pXWindow*/ ) override
         {
-            return NULL;
+            return nullptr;
         }
         css::uno::Reference< css::accessibility::XAccessibleContext >
                 createAccessibleContext( VCLXListBox* /*_pXWindow*/ ) override
         {
-            return NULL;
+            return nullptr;
         }
         css::uno::Reference< css::accessibility::XAccessibleContext >
                 createAccessibleContext( VCLXFixedHyperlink* /*_pXWindow*/ ) override
         {
-            return NULL;
+            return nullptr;
         }
         css::uno::Reference< css::accessibility::XAccessibleContext >
                 createAccessibleContext( VCLXFixedText* /*_pXWindow*/ ) override
         {
-            return NULL;
+            return nullptr;
         }
         css::uno::Reference< css::accessibility::XAccessibleContext >
                 createAccessibleContext( VCLXScrollBar* /*_pXWindow*/ ) override
         {
-            return NULL;
+            return nullptr;
         }
         css::uno::Reference< css::accessibility::XAccessibleContext >
                 createAccessibleContext( VCLXEdit* /*_pXWindow*/ ) override
         {
-            return NULL;
+            return nullptr;
         }
         css::uno::Reference< css::accessibility::XAccessibleContext >
                 createAccessibleContext( VCLXComboBox* /*_pXWindow*/ ) override
         {
-            return NULL;
+            return nullptr;
         }
         css::uno::Reference< css::accessibility::XAccessibleContext >
                 createAccessibleContext( VCLXToolBox* /*_pXWindow*/ ) override
         {
-            return NULL;
+            return nullptr;
         }
         css::uno::Reference< css::accessibility::XAccessibleContext >
                 createAccessibleContext( VCLXWindow* /*_pXWindow*/ ) override
         {
-            return NULL;
+            return nullptr;
         }
         css::uno::Reference< css::accessibility::XAccessible >
                 createAccessible( Menu* /*_pMenu*/, bool /*_bIsMenuBar*/ ) override
         {
-            return NULL;
+            return nullptr;
         }
     };
 
@@ -164,7 +164,7 @@ namespace toolkit
 #ifndef DISABLE_DYNLOADING
             const OUString sModuleName( SVLIBRARY( "acc" ) );
             s_hAccessibleImplementationModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
-            if ( s_hAccessibleImplementationModule != NULL )
+            if ( s_hAccessibleImplementationModule != nullptr )
             {
                 const OUString sFactoryCreationFunc =
                     OUString("getStandardAccessibleFactory");
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index 611b96957347..be2eadd80e61 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -104,7 +104,7 @@ namespace toolkitform
             case FormComponentType::PATTERNFIELD:
                 return new vcl::PDFWriter::EditWidget;
             }
-            return NULL;
+            return nullptr;
         }
 
 
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 93ab90fd702c..7a7265ca33f8 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -92,7 +92,7 @@ struct ImplPropertyInfo
 
 ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
 {
-    static ImplPropertyInfo* pPropertyInfos = NULL;
+    static ImplPropertyInfo* pPropertyInfos = nullptr;
     static sal_uInt16 nElements = 0;
     if( !pPropertyInfos )
     {
@@ -342,7 +342,7 @@ const ImplPropertyInfo* ImplGetImplPropertyInfo( sal_uInt16 nPropertyId )
     for ( n = 0; n < nElements && pInfos[n].nPropId != nPropertyId; ++n)
         ;
 
-    return (n < nElements) ? &pInfos[n] : NULL;
+    return (n < nElements) ? &pInfos[n] : nullptr;
 }
 
 sal_uInt16 GetPropertyOrderNr( sal_uInt16 nPropertyId )
@@ -370,7 +370,7 @@ const css::uno::Type* GetPropertyType( sal_uInt16 nPropertyId )
 {
     const ImplPropertyInfo* pImplPropertyInfo = ImplGetImplPropertyInfo( nPropertyId );
     DBG_ASSERT( pImplPropertyInfo, "Invalid PropertyId!" );
-    return pImplPropertyInfo ? &pImplPropertyInfo->aType : NULL;
+    return pImplPropertyInfo ? &pImplPropertyInfo->aType : nullptr;
 }
 
 sal_Int16 GetPropertyAttribs( sal_uInt16 nPropertyId )
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 0f9974cec6cc..6f21a3c60843 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -125,7 +125,7 @@ extern "C" {
 
 TOOLKIT_DLLPUBLIC UnoWrapperBase* CreateUnoWrapper()
 {
-    return new UnoWrapper( NULL );
+    return new UnoWrapper( nullptr );
 }
 
 }   // extern "C"
@@ -200,7 +200,7 @@ void UnoWrapper::ReleaseAllGraphics( OutputDevice* pOutDev )
         for ( size_t n = 0; n < pLst->size(); n++ )
         {
             VCLXGraphics* pGrf = (*pLst)[ n ];
-            pGrf->SetOutputDevice( NULL );
+            pGrf->SetOutputDevice( nullptr );
         }
     }
 
@@ -208,7 +208,7 @@ void UnoWrapper::ReleaseAllGraphics( OutputDevice* pOutDev )
 
 static bool lcl_ImplIsParent( vcl::Window* pParentWindow, vcl::Window* pPossibleChild )
 {
-    vcl::Window* pWindow = ( pPossibleChild != pParentWindow ) ? pPossibleChild : NULL;
+    vcl::Window* pWindow = ( pPossibleChild != pParentWindow ) ? pPossibleChild : nullptr;
     while ( pWindow && ( pWindow != pParentWindow ) )
         pWindow = pWindow->GetParent();
 
@@ -262,12 +262,12 @@ void UnoWrapper::WindowDestroyed( vcl::Window* pWindow )
 
     VCLXWindow* pWindowPeer = pWindow->GetWindowPeer();
     uno::Reference< lang::XComponent > xWindowPeerComp( pWindow->GetComponentInterface( false ), uno::UNO_QUERY );
-    OSL_ENSURE( ( pWindowPeer != NULL ) == xWindowPeerComp.is(),
+    OSL_ENSURE( ( pWindowPeer != nullptr ) == xWindowPeerComp.is(),
         "UnoWrapper::WindowDestroyed: inconsistency in the window's peers!" );
     if ( pWindowPeer )
     {
-        pWindowPeer->SetWindow( NULL );
-        pWindow->SetWindowPeer( NULL, NULL );
+        pWindowPeer->SetWindow( nullptr );
+        pWindow->SetWindowPeer( nullptr, nullptr );
     }
     if ( xWindowPeerComp.is() )
         xWindowPeerComp->dispose();
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 5dd97a9fc01f..f657be072c44 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -155,7 +155,7 @@ css::uno::Reference< css::awt::XWindow> VCLUnoHelper::GetInterface( vcl::Window*
 
 OutputDevice* VCLUnoHelper::GetOutputDevice( const css::uno::Reference< css::awt::XDevice>& rxDevice )
 {
-    OutputDevice* pOutDev = NULL;
+    OutputDevice* pOutDev = nullptr;
     VCLXDevice* pDev = VCLXDevice::GetImplementation( rxDevice );
     if ( pDev )
         pOutDev = pDev->GetOutputDevice();
@@ -164,7 +164,7 @@ OutputDevice* VCLUnoHelper::GetOutputDevice( const css::uno::Reference< css::awt
 
 OutputDevice* VCLUnoHelper::GetOutputDevice( const css::uno::Reference< css::awt::XGraphics>& rxGraphics )
 {
-    OutputDevice* pOutDev = NULL;
+    OutputDevice* pOutDev = nullptr;
     VCLXGraphics* pGrf = VCLXGraphics::GetImplementation( rxGraphics );
     if ( pGrf )
         pOutDev = pGrf->GetOutputDevice();
@@ -646,7 +646,7 @@ MapUnit /* MapModeUnit */ VCLUnoHelper::ConvertToMapModeUnit(sal_Int16 /* com.su
         break;
 
     default:
-        throw css::lang::IllegalArgumentException("Unsupported measure unit.", NULL, 1 );
+        throw css::lang::IllegalArgumentException("Unsupported measure unit.", nullptr, 1 );
     }
     return eMode;
 }