loplugin:nullptr (automatic rewrite)

Change-Id: I5e94b084c923fa5d9c925630669cf698b34f34ff

49 files changed, 167 insertions, 167 deletions

diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index beb49383b357..ab1e0890d44c 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -68,7 +68,7 @@ class SfxListenerGuard
 {
 public:
     inline SfxListenerGuard(::SfxListener & rListener):
-        m_rListener(rListener), m_pNotifier(0) {}
+        m_rListener(rListener), m_pNotifier(nullptr) {}
 
     inline ~SfxListenerGuard() { endListening(); }
 
@@ -87,7 +87,7 @@ class WindowListenerGuard
 {
 public:
     inline WindowListenerGuard(::Link<VclWindowEvent&,void> const & rListener):
-        m_aListener(rListener), m_pNotifier(0) {}
+        m_aListener(rListener), m_pNotifier(nullptr) {}
 
     inline ~WindowListenerGuard() { endListening(); }
 
@@ -539,7 +539,7 @@ public:
 
     css::i18n::Boundary
     retrieveParagraphLineBoundary( Paragraph const * pParagraph,
-                                   ::sal_Int32 nIndex, ::sal_Int32 *pLineNo = NULL);
+                                   ::sal_Int32 nIndex, ::sal_Int32 *pLineNo = nullptr);
 
     css::i18n::Boundary
     retrieveParagraphBoundaryOfLine( Paragraph const * pParagraph,
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
index cc44bb78d832..6411872fe062 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
@@ -57,7 +57,7 @@ protected:
     virtual void                         implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override;
 
 public:
-    VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = 0 );
+    VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = nullptr );
     virtual ~VCLXAccessibleMenuItem();
 
     // XInterface
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx
index 93c35759a64a..6bba17d9250c 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx
@@ -30,7 +30,7 @@
 class VCLXAccessibleMenuSeparator : public OAccessibleMenuItemComponent
 {
 public:
-    VCLXAccessibleMenuSeparator( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = 0 );
+    VCLXAccessibleMenuSeparator( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = nullptr );
     virtual ~VCLXAccessibleMenuSeparator();
 
     // XServiceInfo
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
index 41baef1bbeea..105a76e55e84 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
@@ -84,7 +84,7 @@ public:
     inline bool         HasFocus() const { return m_bHasFocus; }
     void                SetChecked( bool _bCheck );
     void                SetIndeterminate( bool _bIndeterminate );
-    inline void         ReleaseToolBox() { m_pToolBox = NULL; }
+    inline void         ReleaseToolBox() { m_pToolBox = nullptr; }
     void                NameChanged();
     void                SetChild( const css::uno::Reference< css::accessibility::XAccessible >& _xChild );
     css::uno::Reference< css::accessibility::XAccessible >
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index b0d4a5e136d6..758b36c1f6ad 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -62,7 +62,7 @@ public:
 AccessibleBrowseBox::AccessibleBrowseBox(
             const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxCreator,
             IAccessibleTableProvider& _rBrowseBox )
-    : AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,NULL, BBTYPE_BROWSEBOX )
+    : AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,nullptr, BBTYPE_BROWSEBOX )
 {
     m_xImpl.reset( new AccessibleBrowseBoxImpl() );
     m_xImpl->m_aCreator = _rxCreator;
@@ -89,9 +89,9 @@ void SAL_CALL AccessibleBrowseBox::disposing()
 {
     ::osl::MutexGuard aGuard( getOslMutex() );
 
-    m_xImpl->m_pTable           = NULL;
-    m_xImpl->m_pColumnHeaderBar = NULL;
-    m_xImpl->m_pRowHeaderBar    = NULL;
+    m_xImpl->m_pTable           = nullptr;
+    m_xImpl->m_pColumnHeaderBar = nullptr;
+    m_xImpl->m_pRowHeaderBar    = nullptr;
     m_xImpl->m_aCreator.clear();
 
     Reference< XAccessible >  xTable = m_xImpl->mxTable;
@@ -213,7 +213,7 @@ Rectangle AccessibleBrowseBox::implGetBoundingBox()
 
 Rectangle AccessibleBrowseBox::implGetBoundingBoxOnScreen()
 {
-    return mpBrowseBox->GetWindowExtentsRelative( NULL );
+    return mpBrowseBox->GetWindowExtentsRelative( nullptr );
 }
 
 
@@ -235,7 +235,7 @@ Reference< XAccessible >
 AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType )
 {
     Reference< XAccessible > xRet;
-    Reference< XAccessible >* pxMember = NULL;
+    Reference< XAccessible >* pxMember = nullptr;
 
     if( eObjType == BBTYPE_ROWHEADERBAR )
         pxMember = &m_xImpl->mxRowHeaderBar;
@@ -312,7 +312,7 @@ void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16 _nEventId,
 AccessibleBrowseBoxAccess::AccessibleBrowseBoxAccess( const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox )
         :m_xParent( _rxParent )
         ,m_rBrowseBox( _rBrowseBox )
-        ,m_pContext( NULL )
+        ,m_pContext( nullptr )
 {
 }
 
@@ -326,7 +326,7 @@ void AccessibleBrowseBoxAccess::dispose()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    m_pContext = NULL;
+    m_pContext = nullptr;
     ::comphelper::disposeComponent( m_xContext );
 }
 
@@ -341,7 +341,7 @@ Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibl
     // if the context died meanwhile (there is no listener, so it won't tell us explicitily when this happens),
     // then reset and re-create.
     if ( m_pContext && !m_pContext->isAlive() )
-        m_xContext = m_pContext = NULL;
+        m_xContext = m_pContext = nullptr;
 
     if ( !m_xContext.is() )
         m_xContext = m_pContext = new AccessibleBrowseBox( m_xParent, this, m_rBrowseBox );
@@ -352,7 +352,7 @@ Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibl
 
 bool AccessibleBrowseBoxAccess::isContextAlive() const
 {
-    return  ( NULL != m_pContext ) && m_pContext->isAlive();
+    return  ( nullptr != m_pContext ) && m_pContext->isAlive();
 }
 
 
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 3343a957117b..1ce402dd3309 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -111,8 +111,8 @@ void SAL_CALL AccessibleBrowseBoxBase::disposing()
         AccessibleEventNotifier::revokeClientNotifyDisposing( nId, *this );
     }
 
-    mxParent = NULL;
-    mpBrowseBox = NULL;
+    mxParent = nullptr;
+    mpBrowseBox = nullptr;
 }
 
 // XAccessibleContext ---------------------------------------------------------
@@ -487,12 +487,12 @@ sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole()
 Reference<XAccessible > SAL_CALL AccessibleBrowseBoxBase::getAccessibleAtPoint( const css::awt::Point& )
         throw ( uno::RuntimeException, std::exception )
 {
-    return NULL;
+    return nullptr;
 }
 
 void SAL_CALL AccessibleBrowseBoxBase::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception)
 {
-    m_xFocusWindow = NULL;
+    m_xFocusWindow = nullptr;
 }
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground(  ) throw (css::uno::RuntimeException, std::exception)
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index fe8893191534..22b0ebcdf128 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -124,14 +124,14 @@ Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessib
     throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
-    return NULL;        // no headers in headers
+    return nullptr;        // no headers in headers
 }
 
 Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleColumnHeaders()
     throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
-    return NULL;        // no headers in headers
+    return nullptr;        // no headers in headers
 }
 
 Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleRows()
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
index 6e557f9b9032..7b65f04e8d77 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -45,7 +45,7 @@ AccessibleBrowseBoxTableBase::AccessibleBrowseBoxTableBase(
         const Reference< XAccessible >& rxParent,
         IAccessibleTableProvider&                      rBrowseBox,
         AccessibleBrowseBoxObjType      eObjType ) :
-    BrowseBoxAccessibleElement( rxParent, rBrowseBox,NULL, eObjType )
+    BrowseBoxAccessibleElement( rxParent, rBrowseBox,nullptr, eObjType )
 {
 }
 
@@ -117,14 +117,14 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleCap
     throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
-    return NULL;    // not supported
+    return nullptr;    // not supported
 }
 
 Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleSummary()
     throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
-    return NULL;    // not supported
+    return nullptr;    // not supported
 }
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleIndex(
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index df3797d40bdb..98e3b28315f2 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -85,10 +85,10 @@ void SAL_CALL AccessibleGridControl::disposing()
 {
     SolarMutexGuard g;
 
-    m_xImpl->m_pTable       = NULL;
-    m_xImpl->m_pColumnHeaderBar = NULL;
-    m_xImpl->m_pRowHeaderBar    = NULL;
-    m_xImpl->m_pCell            = NULL;
+    m_xImpl->m_pTable       = nullptr;
+    m_xImpl->m_pColumnHeaderBar = nullptr;
+    m_xImpl->m_pRowHeaderBar    = nullptr;
+    m_xImpl->m_pCell            = nullptr;
     m_xImpl->m_aCreator.clear();
 
     Reference< XAccessible >  xTable = m_xImpl->m_xTable;
@@ -240,7 +240,7 @@ Rectangle AccessibleGridControl::implGetBoundingBox()
 
 Rectangle AccessibleGridControl::implGetBoundingBoxOnScreen()
 {
-    return m_aTable.GetWindowExtentsRelative( NULL );
+    return m_aTable.GetWindowExtentsRelative( nullptr );
 }
 // internal helper methods ----------------------------------------------------
 
@@ -259,7 +259,7 @@ Reference< XAccessible >
 AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType eObjType )
 {
     Reference< XAccessible > xRet;
-    Reference< XAccessible >* pxMember = NULL;
+    Reference< XAccessible >* pxMember = nullptr;
 
     if( eObjType == TCTYPE_ROWHEADERBAR )
         pxMember = &m_xImpl->m_xRowHeaderBar;
@@ -396,7 +396,7 @@ AccessibleGridControlAccess::AccessibleGridControlAccess(
         const Reference< XAccessible >& rxParent, IAccessibleTable& rTable )
     : m_xParent( rxParent )
     , m_pTable( & rTable )
-    , m_pContext( 0 )
+    , m_pContext( nullptr )
 {
 }
 
@@ -410,8 +410,8 @@ void AccessibleGridControlAccess::DisposeAccessImpl()
 {
     SolarMutexGuard g;
 
-    m_pTable = 0;
-    m_pContext = NULL;
+    m_pTable = nullptr;
+    m_pContext = nullptr;
     ::comphelper::disposeComponent( m_xContext );
 }
 
@@ -426,7 +426,7 @@ Reference< XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessi
     // if the context died meanwhile (we're no listener, so it won't tell us explicitily when this happens),
     // then reset an re-create.
     if ( m_pContext && !m_pContext->isAlive() )
-        m_xContext = m_pContext = NULL;
+        m_xContext = m_pContext = nullptr;
 
     if (!m_xContext.is() && m_pTable)
         m_xContext = m_pContext =
@@ -438,7 +438,7 @@ Reference< XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessi
 
 bool AccessibleGridControlAccess::isContextAlive() const
 {
-    return  ( NULL != m_pContext ) && m_pContext->isAlive();
+    return  ( nullptr != m_pContext ) && m_pContext->isAlive();
 }
 
 
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 3f2653e19947..846ed6626d25 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -81,7 +81,7 @@ void SAL_CALL AccessibleGridControlBase::disposing()
         AccessibleEventNotifier::revokeClientNotifyDisposing( nId, *this );
     }
 
-    m_xParent = NULL;
+    m_xParent = nullptr;
     //m_aTable = NULL;
 }
 
@@ -409,7 +409,7 @@ sal_Int16 SAL_CALL AccessibleGridControlBase::getAccessibleRole()
 Reference<XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleAtPoint( const css::awt::Point& )
         throw ( uno::RuntimeException, std::exception )
 {
-    return NULL;
+    return nullptr;
 }
 
 sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground(  ) throw (css::uno::RuntimeException, std::exception)
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 3e133bb2d925..7e43f46ba85a 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -143,7 +143,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibl
     SolarMutexGuard g;
 
     ensureIsAlive();
-    return NULL;        // no headers in headers
+    return nullptr;        // no headers in headers
 }
 
 Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibleColumnHeaders()
@@ -152,7 +152,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibl
     SolarMutexGuard g;
 
     ensureIsAlive();
-    return NULL;        // no headers in headers
+    return nullptr;        // no headers in headers
 }
 //not selectable
 Sequence< sal_Int32 > SAL_CALL AccessibleGridControlHeader::getSelectedAccessibleRows()
@@ -186,7 +186,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlHeader::getAccessibleCell
         sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ )
     throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
-    return NULL;
+    return nullptr;
 }
 // not selectable
 sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleSelected(
@@ -226,7 +226,7 @@ Rectangle AccessibleGridControlHeader::implGetBoundingBox()
 
 Rectangle AccessibleGridControlHeader::implGetBoundingBoxOnScreen()
 {
-    Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( NULL ) );
+    Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( nullptr ) );
     Rectangle aHeaderRect (m_aTable.calcHeaderRect(isColumnBar()));
     if(isColumnBar())
         return Rectangle(aGridRect.TopLeft(), Size(aGridRect.getWidth(),aHeaderRect.getHeight()));
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
index 3b70637454f2..0e5168f52335 100644
--- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -147,7 +147,7 @@ Rectangle AccessibleGridControlHeaderCell::implGetBoundingBox()
 
 Rectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen()
 {
-    Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( NULL ) );
+    Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( nullptr ) );
     sal_Int32 nIndex = getAccessibleIndexInParent();
     Rectangle aCellRect;
     if(m_eObjType == TCTYPE_COLUMNHEADERCELL)
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 54b63c4c7e5d..20df49fd0a6d 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -301,7 +301,7 @@ AccessibleGridControlTable::getSelectedAccessibleChild( sal_Int32 nSelectedChild
     if(isAccessibleChildSelected(nSelectedChildIndex))
         return getAccessibleChild(nSelectedChildIndex);
     else
-        return NULL;
+        return nullptr;
 }
 //not implemented yet, because only row selection possible
 void SAL_CALL AccessibleGridControlTable::deselectAccessibleChild(
@@ -358,7 +358,7 @@ Rectangle AccessibleGridControlTable::implGetBoundingBox()
 
 Rectangle AccessibleGridControlTable::implGetBoundingBoxOnScreen()
 {
-    Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( NULL ));
+    Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( nullptr ));
     Rectangle aTableRect( m_aTable.calcTableRect() );
     long nX = aGridRect.Left() + aTableRect.Left();
     long nY = aGridRect.Top() + aTableRect.Top();
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index db38371cc48e..6f30fd7bbbf6 100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -127,7 +127,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleC
     SolarMutexGuard g;
 
     ensureIsAlive();
-    return NULL;    // not supported
+    return nullptr;    // not supported
 }
 
 Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleSummary()
@@ -136,7 +136,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleS
     SolarMutexGuard g;
 
     ensureIsAlive();
-    return NULL;    // not supported
+    return nullptr;    // not supported
 }
 
 sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleIndex(
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 68c7bde79cc1..bf53d172d1dd 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -351,7 +351,7 @@ namespace accessibility
 
     Rectangle AccessibleGridControlTableCell::implGetBoundingBoxOnScreen()
     {
-        Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( NULL );
+        Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( nullptr );
         sal_Int32 nIndex = getAccessibleIndexInParent();
         Rectangle aCellRect = m_aTable.calcCellRect(nIndex%m_aTable.GetColumnCount(), nIndex/m_aTable.GetColumnCount());
         long nX = aGridRect.Left() + aCellRect.Left();
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index 66ad4343aef0..863faa4dcaba 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -159,14 +159,14 @@ namespace accessibility
 
     Reference< XAccessible > AccessibleToolPanelDeck_Impl::getActivePanelAccessible()
     {
-        ENSURE_OR_RETURN( !isDisposed(), "AccessibleToolPanelDeck_Impl::getActivePanelAccessible: already disposed!", NULL );
+        ENSURE_OR_RETURN( !isDisposed(), "AccessibleToolPanelDeck_Impl::getActivePanelAccessible: already disposed!", nullptr );
 
         if ( !m_xActivePanelAccessible.is() )
         {
             ::boost::optional< size_t > aActivePanel( m_pPanelDeck->GetActivePanel() );
-            ENSURE_OR_RETURN( !!aActivePanel, "AccessibleToolPanelDeck_Impl::getActivePanelAccessible: this should not be called without an active panel!", NULL );
+            ENSURE_OR_RETURN( !!aActivePanel, "AccessibleToolPanelDeck_Impl::getActivePanelAccessible: this should not be called without an active panel!", nullptr );
             ::svt::PToolPanel pActivePanel( m_pPanelDeck->GetPanel( *aActivePanel ) );
-            ENSURE_OR_RETURN( pActivePanel.get() != NULL, "AccessibleToolPanelDeck_Impl::getActivePanelAccessible: no active panel!", NULL );
+            ENSURE_OR_RETURN( pActivePanel.get() != nullptr, "AccessibleToolPanelDeck_Impl::getActivePanelAccessible: no active panel!", nullptr );
             m_xActivePanelAccessible = pActivePanel->CreatePanelAccessible( getOwnAccessible() );
             OSL_ENSURE( m_xActivePanelAccessible.is(), "AccessibleToolPanelDeck_Impl::getActivePanelAccessible: illegal accessible returned by the panel!" );
         }
@@ -300,7 +300,7 @@ namespace accessibility
         try
         {
             const ::svt::PDeckLayouter pLayouter( m_xImpl->m_pPanelDeck->GetLayouter() );
-            ENSURE_OR_THROW( pLayouter.get() != NULL, "invalid layouter" );
+            ENSURE_OR_THROW( pLayouter.get() != nullptr, "invalid layouter" );
 
             const size_t nLayouterChildren = pLayouter->GetAccessibleChildCount();
             for ( size_t i=0; i<nLayouterChildren; ++i )
@@ -317,7 +317,7 @@ namespace accessibility
             DBG_UNHANDLED_EXCEPTION();
         }
 
-        return NULL;
+        return nullptr;
     }
 
     void SAL_CALL AccessibleToolPanelDeck::grabFocus(  ) throw (RuntimeException, std::exception)
@@ -337,7 +337,7 @@ namespace accessibility
         // don't let the base class generate any A11Y events from VclWindowEvent, we completely manage those
         // A11Y events ourself
         (void)i_rVclWindowEvent;
-        return NULL;
+        return nullptr;
     }
 
     void AccessibleToolPanelDeck::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet )
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index a3bd05477323..a7a1a3b9b46b 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -97,7 +97,7 @@ namespace accessibility
         virtual ~AccessibleToolPanelTabBar_Impl();
 
         void    checkDisposed();
-        bool    isDisposed() const { return m_pPanelDeck == NULL; }
+        bool    isDisposed() const { return m_pPanelDeck == nullptr; }
         void    dispose();
 
         ::svt::IToolPanelDeck*          getPanelDeck() const { return m_pPanelDeck; }
@@ -159,7 +159,7 @@ namespace accessibility
     {
         ENSURE_OR_RETURN_VOID( !isDisposed(), "disposed twice" );
         m_pPanelDeck->RemoveListener( *this );
-        m_pPanelDeck = NULL;
+        m_pPanelDeck = nullptr;
 
         m_pTabBar->GetScrollButton( true ).RemoveEventListener( LINK( this, AccessibleToolPanelTabBar_Impl, OnWindowEvent ) );
         m_pTabBar->GetScrollButton( false ).RemoveEventListener( LINK( this, AccessibleToolPanelTabBar_Impl, OnWindowEvent ) );
@@ -170,8 +170,8 @@ namespace accessibility
 
     Reference< XAccessible > AccessibleToolPanelTabBar_Impl::getAccessiblePanelItem( size_t i_nPosition )
     {
-        ENSURE_OR_RETURN( !isDisposed(), "AccessibleToolPanelTabBar_Impl::getAccessiblePanelItem: already disposed!", NULL );
-        ENSURE_OR_RETURN( i_nPosition < m_aChildren.size(), "AccessibleToolPanelTabBar_Impl::getAccessiblePanelItem: invalid index!", NULL );
+        ENSURE_OR_RETURN( !isDisposed(), "AccessibleToolPanelTabBar_Impl::getAccessiblePanelItem: already disposed!", nullptr );
+        ENSURE_OR_RETURN( i_nPosition < m_aChildren.size(), "AccessibleToolPanelTabBar_Impl::getAccessiblePanelItem: invalid index!", nullptr );
 
         Reference< XAccessible >& rAccessibleChild( m_aChildren[ i_nPosition ] );
         if ( !rAccessibleChild.is() )
@@ -304,7 +304,7 @@ namespace accessibility
         if ( bScrollBackRequested || bScrollForwardRequested )
         {
             Reference< XAccessible > xScrollButtonAccessible( m_xImpl->getTabBar()->GetScrollButton( bScrollForwardRequested ).GetAccessible() );
-            ENSURE_OR_RETURN( xScrollButtonAccessible.is(), "AccessibleToolPanelTabBar::getAccessibleChild: invalid button accessible!", NULL );
+            ENSURE_OR_RETURN( xScrollButtonAccessible.is(), "AccessibleToolPanelTabBar::getAccessibleChild: invalid button accessible!", nullptr );
         #if OSL_DEBUG_LEVEL > 0
             Reference< XAccessibleContext > xScrollButtonContext( xScrollButtonAccessible->getAccessibleContext() );
             ENSURE_OR_RETURN( xScrollButtonContext.is(), "AccessibleToolPanelTabBar::getAccessibleChild: invalid button accessible context!", xScrollButtonAccessible );
@@ -365,7 +365,7 @@ namespace accessibility
             return m_xImpl->getTabBar()->GetScrollButton( true ).GetAccessible();
 
         // no hit
-        return NULL;
+        return nullptr;
     }
 
     void SAL_CALL AccessibleToolPanelTabBar::disposing()
@@ -379,7 +379,7 @@ namespace accessibility
         // don't let the base class generate any A11Y events from VclWindowEvent, we completely manage those
         // A11Y events ourself
         (void)i_rVclWindowEvent;
-        return NULL;
+        return nullptr;
     }
 
     void AccessibleToolPanelTabBar::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet )
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
index 84b0eb7822bc..a64e97d4337e 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
@@ -82,7 +82,7 @@ namespace accessibility
         virtual void Dying() override;
 
     public:
-        bool    isDisposed() const { return m_pPanelDeck == NULL; }
+        bool    isDisposed() const { return m_pPanelDeck == nullptr; }
         void    checkDisposed() const;
         void    dispose();
 
@@ -135,7 +135,7 @@ namespace accessibility
 
         m_xAccessibleParent.clear();
         m_pPanelDeck->RemoveListener( *this );
-        m_pPanelDeck = NULL;
+        m_pPanelDeck = nullptr;
         m_pTabBar.clear();
     }
 
@@ -148,7 +148,7 @@ namespace accessibility
     OUString AccessibleToolPanelDeckTabBarItem_Impl::getPanelDisplayName()
     {
         const ::svt::PToolPanel pPanel( m_pPanelDeck->GetPanel( getItemPos() ) );
-        if ( pPanel.get() == NULL )
+        if ( pPanel.get() == nullptr )
             throw DisposedException();
         return pPanel->GetDisplayName();
     }
@@ -320,7 +320,7 @@ namespace accessibility
         ItemMethodGuard aGuard( *m_xImpl );
         // we do not have children ...
         (void)i_rLocation;
-        return NULL;
+        return nullptr;
     }
 
     void SAL_CALL AccessibleToolPanelDeckTabBarItem::grabFocus(  ) throw (RuntimeException, std::exception)
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index 1b8b5f5351e0..d4c1aa509660 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -212,7 +212,7 @@ namespace accessibility
             }
         }
 
-        m_pBrowseBox = NULL;
+        m_pBrowseBox = nullptr;
         m_xControlAccessible.clear();
         m_aContext.clear();
         // NO dispose of the inner object there: it is the XAccessible of an window, and disposing
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index 4847b25cbdb2..172438bcfdeb 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -94,7 +94,7 @@ namespace accessibility
                     if ( pCtrl && pCtrl->HasFocus() )
                     {
                         SvxIconChoiceCtrlEntry* pEntry = static_cast< SvxIconChoiceCtrlEntry* >( rVclWindowEvent.GetData() );
-                        if ( pEntry == NULL )
+                        if ( pEntry == nullptr )
                         {
                             pEntry = getCtrl()->GetSelectedEntry();
                         }
@@ -122,7 +122,7 @@ namespace accessibility
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        m_xParent = NULL;
+        m_xParent = nullptr;
     }
 
     // XServiceInfo
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index b33145d09697..07bd58426ab3 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -123,7 +123,7 @@ throw(RuntimeException, std::exception)
         {
             aRect = m_pIconCtrl->GetBoundingBox( pEntry );
             Point aTopLeft = aRect.TopLeft();
-            aTopLeft += m_pIconCtrl->GetWindowExtentsRelative( NULL ).TopLeft();
+            aTopLeft += m_pIconCtrl->GetWindowExtentsRelative( nullptr ).TopLeft();
             aRect = Rectangle( aTopLeft, aRect.GetSize() );
         }
 
@@ -224,8 +224,8 @@ throw(RuntimeException, std::exception)
         if ( xComp.is() )
             xComp->removeEventListener( this );
 
-        m_pIconCtrl = NULL;
-        m_xParent = NULL;
+        m_pIconCtrl = nullptr;
+        m_xParent = nullptr;
     }
 
     // XServiceInfo
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 3287b9a03fce..019c6b5fe23c 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -155,12 +155,12 @@ namespace accessibility
                             MAP_ENTRY::iterator mi = m_mapEntry.find(pEntry);
                             if(mi != m_mapEntry.end())
                             {
-                                OSL_ASSERT(mi->second.get() != NULL);
+                                OSL_ASSERT(mi->second.get() != nullptr);
                                 m_xFocusedChild = mi->second;
                             }
                             else
                             {
-                                AccessibleListBoxEntry *pEntNew = new AccessibleListBoxEntry( *getListBox(), pEntry, NULL );
+                                AccessibleListBoxEntry *pEntNew = new AccessibleListBoxEntry( *getListBox(), pEntry, nullptr );
                                 m_xFocusedChild = pEntNew;
                                 m_mapEntry.insert(MAP_ENTRY::value_type(pEntry,pEntNew));
                             }
@@ -239,7 +239,7 @@ namespace accessibility
         AccessibleListBoxEntry* pEntryFocus =static_cast< AccessibleListBoxEntry* >(m_xFocusedChild.get());
         if (pEntryFocus && pEntry && pEntry != pEntryFocus->GetSvLBoxEntry())
         {
-            AccessibleListBoxEntry *pAccCurOptionEntry =NULL;
+            AccessibleListBoxEntry *pAccCurOptionEntry =nullptr;
             MAP_ENTRY::iterator mi = m_mapEntry.find(pEntry);
             if (mi != m_mapEntry.end())
             {
@@ -247,7 +247,7 @@ namespace accessibility
             }
             else
             {
-                pAccCurOptionEntry =new AccessibleListBoxEntry( *getListBox(), pEntry, NULL );
+                pAccCurOptionEntry =new AccessibleListBoxEntry( *getListBox(), pEntry, nullptr );
                 std::pair<MAP_ENTRY::iterator, bool> pairMi =  m_mapEntry.insert(MAP_ENTRY::value_type(pAccCurOptionEntry->GetSvLBoxEntry(),pAccCurOptionEntry));
                 mi = pairMi.first;
             }
@@ -313,7 +313,7 @@ namespace accessibility
 
         m_mapEntry.clear();
         VCLXAccessibleComponent::disposing();
-        m_xParent = NULL;
+        m_xParent = nullptr;
     }
 
     // XServiceInfo
@@ -368,7 +368,7 @@ namespace accessibility
         sal_Int32 nCount = 0;
         SvTreeListBox* pSvTreeListBox = getListBox();
         if ( pSvTreeListBox )
-            nCount = pSvTreeListBox->GetLevelChildCount( NULL );
+            nCount = pSvTreeListBox->GetLevelChildCount( nullptr );
 
         return nCount;
     }
@@ -384,7 +384,7 @@ namespace accessibility
 
         // Solution: Set the parameter of the parent to null to let entry determine the parent by itself
         //return new AccessibleListBoxEntry( *getListBox(), pEntry, this );
-        return new AccessibleListBoxEntry( *getListBox(), pEntry, NULL );
+        return new AccessibleListBoxEntry( *getListBox(), pEntry, nullptr );
     }
 
     Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleParent(  ) throw (RuntimeException, std::exception)
@@ -499,7 +499,7 @@ namespace accessibility
 
         ensureAlive();
 
-        sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
+        sal_Int32 nCount = getListBox()->GetLevelChildCount( nullptr );
         for ( sal_Int32 i = 0; i < nCount; ++i )
         {
             SvTreeListEntry* pEntry = getListBox()->GetEntry( i );
@@ -514,7 +514,7 @@ namespace accessibility
 
         ensureAlive();
 
-        sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
+        sal_Int32 nCount = getListBox()->GetLevelChildCount( nullptr );
         for ( sal_Int32 i = 0; i < nCount; ++i )
         {
             SvTreeListEntry* pEntry = getListBox()->GetEntry( i );
@@ -543,7 +543,7 @@ namespace accessibility
 
         Reference< XAccessible > xChild;
         sal_Int32 nSelCount= 0;
-        sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
+        sal_Int32 nCount = getListBox()->GetLevelChildCount( nullptr );
         for ( sal_Int32 i = 0; i < nCount; ++i )
         {
             SvTreeListEntry* pEntry = getListBox()->GetEntry( i );
@@ -554,7 +554,7 @@ namespace accessibility
             {
                 // Solution: Set the parameter of the parent to null to let entry determine the parent by itself
                 //xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, this );
-                xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, NULL );
+                xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, nullptr );
                 break;
             }
         }
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 073d38fc8e05..f49fc0e3a761 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -135,7 +135,7 @@ namespace accessibility
         {
             aRect = getListBox()->GetBoundingRect( pEntry );
             Point aTopLeft = aRect.TopLeft();
-            aTopLeft += getListBox()->GetWindowExtentsRelative( NULL ).TopLeft();
+            aTopLeft += getListBox()->GetWindowExtentsRelative( nullptr ).TopLeft();
             aRect = Rectangle( aTopLeft, aRect.GetSize() );
         }
 
@@ -351,7 +351,7 @@ namespace accessibility
                 if ( pParentEntry )
                     pParentEntry = getListBox()->GetParent(pParentEntry);
                 if ( pParentEntry )
-                    xParent = new AccessibleListBoxEntry( *getListBox(), pParentEntry, NULL );
+                    xParent = new AccessibleListBoxEntry( *getListBox(), pParentEntry, nullptr );
                     // note that we pass NULL here as parent-accessible:
                     // this is allowed, as the AccessibleListBoxEntry class will create its parent
                     // when needed
@@ -1201,7 +1201,7 @@ namespace accessibility
 
     SvTreeListEntry* AccessibleListBoxEntry::GetRealChild(sal_Int32 nIndex)
     {
-        SvTreeListEntry* pEntry = NULL;
+        SvTreeListEntry* pEntry = nullptr;
         SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
         if (pParent)
         {
diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx
index a8a6c87439f7..49d18dce8b4e 100644
--- a/accessibility/source/extended/accessibletabbarbase.cxx
+++ b/accessibility/source/extended/accessibletabbarbase.cxx
@@ -31,7 +31,7 @@ namespace accessibility
 
 AccessibleTabBarBase::AccessibleTabBarBase( TabBar* pTabBar ) :
     AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() ),
-    m_pTabBar( 0 )
+    m_pTabBar( nullptr )
 {
     m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() );
     SetTabBarPointer( pTabBar );
@@ -50,7 +50,7 @@ IMPL_LINK_TYPED( AccessibleTabBarBase, WindowEventListener, VclWindowEvent&, rEv
 
     if( ( rEvent.GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) &&
         ( (sal_uInt16)reinterpret_cast<sal_IntPtr>(rEvent.GetData()) == TabBar::PAGE_NOT_FOUND ) &&
-        ( dynamic_cast< AccessibleTabBarPageList *> (this) != NULL ) )
+        ( dynamic_cast< AccessibleTabBarPageList *> (this) != nullptr ) )
     {
         return;
     }
@@ -88,7 +88,7 @@ void AccessibleTabBarBase::ClearTabBarPointer()
     if( m_pTabBar )
     {
         m_pTabBar->RemoveEventListener( LINK( this, AccessibleTabBarBase, WindowEventListener ) );
-        m_pTabBar = 0;
+        m_pTabBar = nullptr;
     }
 }
 
diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx
index f2ec2d8c9126..fccc8e8d300b 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -39,7 +39,7 @@ namespace accessibility
     // Ctor() and Dtor()
 
     AccessibleTabListBox::AccessibleTabListBox( const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox )
-        :AccessibleBrowseBox( rxParent, NULL, rBox )
+        :AccessibleBrowseBox( rxParent, nullptr, rBox )
         ,m_pTabListBox( &rBox )
 
     {
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 4dc268fbd8e8..92f1a230221d 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -53,7 +53,7 @@ namespace accessibility
     {
         if ( isAlive() )
         {
-            m_pTabListBox = NULL;
+            m_pTabListBox = nullptr;
 
             // increment ref count to prevent double call of Dtor
             osl_atomic_increment( &m_refCount );
@@ -71,7 +71,7 @@ namespace accessibility
                 case  VCLEVENT_OBJECT_DYING :
                 {
                     m_pTabListBox->RemoveEventListener( LINK( this, AccessibleTabListBoxTable, WindowEventListener ) );
-                    m_pTabListBox = NULL;
+                    m_pTabListBox = nullptr;
                     break;
                 }
 
@@ -218,7 +218,7 @@ namespace accessibility
                     {
                         commitEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
                         TabListBoxEventData* pData = static_cast< TabListBoxEventData* >( rVclWindowEvent.GetData() );
-                        SvTreeListEntry* pEntry = pData != NULL ? pData->m_pEntry : NULL;
+                        SvTreeListEntry* pEntry = pData != nullptr ? pData->m_pEntry : nullptr;
                         if ( pEntry )
                         {
                             sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx
index fdc340ebcd00..47fb3b62b821 100644
--- a/accessibility/source/extended/listboxaccessible.cxx
+++ b/accessibility/source/extended/listboxaccessible.cxx
@@ -54,7 +54,7 @@ namespace accessibility
         SolarMutexGuard g;
         if ( m_pWindow )
             m_pWindow->RemoveEventListener( LINK( this, ListBoxAccessibleBase, WindowEventListener ) );
-        m_pWindow = NULL;
+        m_pWindow = nullptr;
     }
 
     void ListBoxAccessibleBase::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
@@ -67,7 +67,7 @@ namespace accessibility
                 {
                     if ( m_pWindow )
                         m_pWindow->RemoveEventListener( LINK( this, ListBoxAccessibleBase, WindowEventListener ) );
-                    m_pWindow = NULL;
+                    m_pWindow = nullptr;
                     dispose();
                     break;
                 }
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index a970ef1508e0..b21c77169dd0 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -31,17 +31,17 @@ namespace accessibility
 {
 void SfxListenerGuard::startListening(::SfxBroadcaster & rNotifier)
 {
-    OSL_ENSURE(m_pNotifier == 0, "called more than once");
+    OSL_ENSURE(m_pNotifier == nullptr, "called more than once");
     m_pNotifier = &rNotifier;
     m_rListener.StartListening(*m_pNotifier, true);
 }
 
 void SfxListenerGuard::endListening()
 {
-    if (m_pNotifier != 0)
+    if (m_pNotifier != nullptr)
     {
         m_rListener.EndListening(*m_pNotifier);
-        m_pNotifier = 0;
+        m_pNotifier = nullptr;
     }
 }
 
@@ -221,7 +221,7 @@ Paragraph::getAccessibleAtPoint(css::awt::Point const &)
     throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
-    return 0;
+    return nullptr;
 }
 
 // virtual
@@ -1511,7 +1511,7 @@ Document::getAccessibleAtPoint(css::awt::Point const & rPoint)
                 return getAccessibleChild(aIt);
         }
     }
-    return 0;
+    return nullptr;
 }
 void Document::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -1537,7 +1537,7 @@ void SAL_CALL Document::disposing()
 {
     m_aEngineListener.endListening();
     m_aViewListener.endListening();
-    if (m_xParagraphs.get() != 0)
+    if (m_xParagraphs.get() != nullptr)
         disposeParagraphs();
     VCLXAccessibleComponent::disposing();
 }
@@ -1751,7 +1751,7 @@ IMPL_LINK_TYPED(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void)
 
 void Document::init()
 {
-    if (m_xParagraphs.get() == 0)
+    if (m_xParagraphs.get() == nullptr)
     {
         const sal_uInt32 nCount = m_rEngine.GetParagraphCount();
         m_xParagraphs.reset(new Paragraphs);
diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx
index e05cea6c38ad..43dc9fedaeb4 100644
--- a/accessibility/source/helper/accresmgr.cxx
+++ b/accessibility/source/helper/accresmgr.cxx
@@ -28,7 +28,7 @@ using namespace accessibility;
 // TkResMgr
 
 
-SimpleResMgr* TkResMgr::m_pImpl = NULL;
+SimpleResMgr* TkResMgr::m_pImpl = nullptr;
 
 
 
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 26a62b52b221..06aaeb3f99b3 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -70,7 +70,7 @@ OAccessibleMenuBaseComponent::~OAccessibleMenuBaseComponent()
         m_pMenu->RemoveEventListener( LINK( this, OAccessibleMenuBaseComponent, MenuEventListener ) );
 
     delete m_pExternalLock;
-    m_pExternalLock = NULL;
+    m_pExternalLock = nullptr;
 }
 
 
@@ -661,7 +661,7 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen
             {
                 m_pMenu->RemoveEventListener( LINK( this, OAccessibleMenuBaseComponent, MenuEventListener ) );
 
-                m_pMenu = NULL;
+                m_pMenu = nullptr;
 
                 // dispose all menu items
                 for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
@@ -705,7 +705,7 @@ void OAccessibleMenuBaseComponent::disposing()
     {
         m_pMenu->RemoveEventListener( LINK( this, OAccessibleMenuBaseComponent, MenuEventListener ) );
 
-        m_pMenu = NULL;
+        m_pMenu = nullptr;
 
         // dispose all menu items
         for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index 1590d99510e8..63626fa28740 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -115,7 +115,7 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException
         if ( pWindow )
         {
             // get bounding rectangle of the window in screen coordinates
-            Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL );
+            Rectangle aRect = pWindow->GetWindowExtentsRelative( nullptr );
             aBounds = AWTRectangle( aRect );
 
             // get position of the accessible parent in screen coordinates
@@ -274,7 +274,7 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen(  ) throw (RuntimeExcep
         vcl::Window* pWindow = m_pMenu->GetWindow();
         if ( pWindow )
         {
-            Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL );
+            Rectangle aRect = pWindow->GetWindowExtentsRelative( nullptr );
             aPos = AWTPoint( aRect.TopLeft() );
         }
     }
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 34c650c05a70..f2e1c78712b9 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -271,7 +271,7 @@ awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeExcep
         vcl::Window* pWindow = m_pParent->GetWindow();
         if ( pWindow )
         {
-            Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL );
+            Rectangle aRect = pWindow->GetWindowExtentsRelative( nullptr );
             awt::Point aWindowScreenLoc = AWTPoint( aRect.TopLeft() );
 
             // get position of accessible parent in screen coordinates
@@ -302,7 +302,7 @@ void SAL_CALL OAccessibleMenuItemComponent::disposing()
 {
     OAccessibleMenuBaseComponent::disposing();
 
-    m_pParent = NULL;
+    m_pParent = nullptr;
     m_sAccessibleName.clear();
     m_sItemText.clear();
 }
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index f83f0b6bbd5c..529b0409de35 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -76,7 +76,7 @@ void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindo
             if (m_aBoxType==COMBOBOX)
             {
                 VclPtr< ComboBox > pComboBox = GetAs< ComboBox >();
-                if ( ( pComboBox != nullptr ) && ( pChildWindow != NULL ) )
+                if ( ( pComboBox != nullptr ) && ( pChildWindow != nullptr ) )
                     if (pChildWindow == pComboBox->GetSubEdit())
                     {
                         if (rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW)
@@ -89,7 +89,7 @@ void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindo
                         {
                             // Release text field.
                             aOldValue <<= m_xText;
-                            m_xText = NULL;
+                            m_xText = nullptr;
                         }
                         // Tell the listeners about the new/removed child.
                         NotifyAccessibleEvent (
@@ -116,12 +116,12 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
         {
             // Forward the call to the list child.
             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
-            if ( pList == NULL )
+            if ( pList == nullptr )
             {
                 getAccessibleChild ( m_bHasTextChild ? 1 : 0 );
                 pList = static_cast<VCLXAccessibleList*>(m_xList.get());
             }
-            if ( pList != NULL )
+            if ( pList != nullptr )
             {
                 pList->ProcessWindowEvent (rVclWindowEvent, m_bIsDropDownBox);
 #if defined WNT
@@ -136,12 +136,12 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
         case VCLEVENT_DROPDOWN_OPEN:
         {
             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
-            if ( pList == NULL )
+            if ( pList == nullptr )
             {
                 getAccessibleChild ( m_bHasTextChild ? 1 : 0 );
                 pList = static_cast<VCLXAccessibleList*>(m_xList.get());
             }
-            if ( pList != NULL )
+            if ( pList != nullptr )
             {
                 pList->ProcessWindowEvent (rVclWindowEvent);
                 pList->HandleDropOpen();
@@ -151,12 +151,12 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
         case VCLEVENT_DROPDOWN_CLOSE:
         {
             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
-            if ( pList == NULL )
+            if ( pList == nullptr )
             {
                 getAccessibleChild ( m_bHasTextChild ? 1 : 0 );
                 pList = static_cast<VCLXAccessibleList*>(m_xList.get());
             }
-            if ( pList != NULL )
+            if ( pList != nullptr )
             {
                 pList->ProcessWindowEvent (rVclWindowEvent);
             }
@@ -172,7 +172,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
         case VCLEVENT_COMBOBOX_SELECT:
         {
             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
-            if (pList != NULL && m_xText.is())
+            if (pList != nullptr && m_xText.is())
             {
                 Reference<XAccessibleText> xText (m_xText->getAccessibleContext(), UNO_QUERY);
                 if ( xText.is() )
@@ -202,12 +202,12 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
         {
             // Forward the call to the list child.
             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
-            if ( pList == NULL )
+            if ( pList == nullptr )
             {
                 getAccessibleChild ( m_bHasTextChild ? 1 : 0 );
                 pList = static_cast<VCLXAccessibleList*>(m_xList.get());
             }
-            if ( pList != NULL )
+            if ( pList != nullptr )
                 pList->ProcessWindowEvent (rVclWindowEvent);
             break;
         }
@@ -220,7 +220,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
             // combobox, however, we have to help by providing the list with
             // the text of the currently selected item.
             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
-            if (pList != NULL && m_xText.is())
+            if (pList != nullptr && m_xText.is())
             {
                 Reference<XAccessibleText> xText (m_xText->getAccessibleContext(), UNO_QUERY);
                 if ( xText.is() )
@@ -246,7 +246,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
                 {
                     Reference<XAccessibleContext> xContext = m_xText->getAccessibleContext();
                     VCLXAccessibleEdit* pEdit = static_cast<VCLXAccessibleEdit*>(xContext.get());
-                    if (pEdit != NULL)
+                    if (pEdit != nullptr)
                         pEdit->ProcessWindowEvent (rVclWindowEvent);
                 }
             }
@@ -287,9 +287,9 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleChildCount()
     {
         // Object not valid anymore.  Release references to children.
         m_bHasTextChild = false;
-        m_xText = NULL;
+        m_xText = nullptr;
         m_bHasListChild = false;
-        m_xList = NULL;
+        m_xList = nullptr;
     }
 
     return nCount;
@@ -328,7 +328,7 @@ Reference<XAccessible> SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int32
                 if (m_aBoxType==COMBOBOX)
                 {
                     VclPtr< ComboBox > pComboBox = GetAs< ComboBox >();
-                    if (pComboBox!=nullptr && pComboBox->GetSubEdit()!=NULL)
+                    if (pComboBox!=nullptr && pComboBox->GetSubEdit()!=nullptr)
                     //Set the edit's acc name the same as parent
                     {
                         pComboBox->GetSubEdit()->SetAccessibleName(getAccessibleName());
diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx
index 48e7a78dcecf..b030a1d3f0ec 100644
--- a/accessibility/source/standard/vclxaccessiblecombobox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx
@@ -45,7 +45,7 @@ VCLXAccessibleComboBox::~VCLXAccessibleComboBox()
 
 bool VCLXAccessibleComboBox::IsValid() const
 {
-    return GetWindow().get() != NULL;
+    return GetWindow().get() != nullptr;
 }
 
 void VCLXAccessibleComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index 66831d6a8f3a..cb58fddfd145 100644
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -59,7 +59,7 @@ VCLXAccessibleDropDownComboBox::~VCLXAccessibleDropDownComboBox()
 
 bool VCLXAccessibleDropDownComboBox::IsValid() const
 {
-    return GetWindow().get() != NULL;
+    return GetWindow().get() != nullptr;
 }
 
 void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
index 30b400ce44d0..2a563cef5ebc 100644
--- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
@@ -58,7 +58,7 @@ VCLXAccessibleDropDownListBox::~VCLXAccessibleDropDownListBox()
 
 bool VCLXAccessibleDropDownListBox::IsValid() const
 {
-    return GetWindow().get() != NULL;
+    return GetWindow().get() != nullptr;
 }
 
 void VCLXAccessibleDropDownListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index dd4ac1af09e2..54736a58f6e2 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -55,7 +55,7 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType
                                         const Reference< XAccessible >& _xParent)
     : VCLXAccessibleComponent   (pVCLWindow),
       m_aBoxType                (aBoxType),
-      m_pListBoxHelper          (0),
+      m_pListBoxHelper          (nullptr),
       m_nVisibleLineCount       (0),
       m_nIndexInParent          (DEFAULT_INDEX_IN_PARENT),
       m_nLastTopEntry           ( 0 ),
@@ -116,7 +116,7 @@ void SAL_CALL VCLXAccessibleList::disposing()
     clearItems();
 
     delete m_pListBoxHelper;
-    m_pListBoxHelper = NULL;
+    m_pListBoxHelper = nullptr;
 }
 
 
@@ -879,7 +879,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild
         return getAccessibleChild( (sal_Int32)m_pListBoxHelper->GetSelectEntryPos( (sal_uInt16)nSelectedChildIndex ) );
     }
 
-    return NULL;
+    return nullptr;
 }
 
 void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx
index 4eea07a14258..c50b9e0822a9 100644
--- a/accessibility/source/standard/vclxaccessiblelistbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx
@@ -56,7 +56,7 @@ VCLXAccessibleListBox::~VCLXAccessibleListBox()
 
 bool VCLXAccessibleListBox::IsValid() const
 {
-    return GetWindow().get() != NULL;
+    return GetWindow().get() != nullptr;
 }
 
 void VCLXAccessibleListBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index dde188882a06..cfef2e4e3860 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -184,9 +184,9 @@ void SAL_CALL VCLXAccessibleListItem::disposing()
 
         VCLXAccessibleListItem_BASE::disposing();
         m_sEntryText.clear();
-        m_pListBoxHelper    = NULL;
-        m_xParent           = NULL;
-        m_xParentContext    = NULL;
+        m_pListBoxHelper    = nullptr;
+        m_xParent           = nullptr;
+        m_xParentContext    = nullptr;
 
         nId = m_nClientId;
         m_nClientId =  0;
@@ -377,7 +377,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen(  ) throw (Runti
     {
         Rectangle aRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
         aPoint = aRect.TopLeft();
-        aPoint += m_pListBoxHelper->GetWindowExtentsRelative( NULL ).TopLeft();
+        aPoint += m_pListBoxHelper->GetWindowExtentsRelative( nullptr ).TopLeft();
     }
     return AWTPoint( aPoint );
 }
@@ -578,7 +578,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_I
             vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText );
 
             SolarMutexReleaser aReleaser;
-            xClipboard->setContents( pDataObj, NULL );
+            xClipboard->setContents( pDataObj, nullptr );
             Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
             if( xFlushableClipboard.is() )
                 xFlushableClipboard->flushClipboard();
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 36209fefa6b4..5f64d999fb05 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -47,7 +47,7 @@ VCLXAccessibleMenuBar::VCLXAccessibleMenuBar( Menu* pMenu )
     }
     else
     {
-        m_pWindow = 0;
+        m_pWindow = nullptr;
     }
 }
 
@@ -99,7 +99,7 @@ void VCLXAccessibleMenuBar::ProcessWindowEvent( const VclWindowEvent& rVclWindow
             if ( m_pWindow )
             {
                 m_pWindow->RemoveEventListener( LINK( this, VCLXAccessibleMenuBar, WindowEventListener ) );
-                m_pWindow = NULL;
+                m_pWindow = nullptr;
             }
         }
         break;
@@ -121,7 +121,7 @@ void VCLXAccessibleMenuBar::disposing()
     if ( m_pWindow )
     {
         m_pWindow->RemoveEventListener( LINK( this, VCLXAccessibleMenuBar, WindowEventListener ) );
-        m_pWindow = NULL;
+        m_pWindow = nullptr;
     }
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 73b013906a1b..6a257faff6e0 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -406,7 +406,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd
                 vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText );
 
                 SolarMutexReleaser aReleaser;
-                xClipboard->setContents( pDataObj, NULL );
+                xClipboard->setContents( pDataObj, nullptr );
                 Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
                 if( xFlushableClipboard.is() )
                     xFlushableClipboard->flushClipboard();
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index e3bbff890d6a..701e62f9ac9a 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -234,7 +234,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
         {
             if ( m_pStatusBar )
             {
-                m_pStatusBar = NULL;
+                m_pStatusBar = nullptr;
 
                 // dispose all children
                 for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
@@ -264,7 +264,7 @@ void VCLXAccessibleStatusBar::disposing()
 
     if ( m_pStatusBar )
     {
-        m_pStatusBar = NULL;
+        m_pStatusBar = nullptr;
 
         // dispose all children
         for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index 586a1d7a525f..9179ae9486c5 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -65,7 +65,7 @@ VCLXAccessibleStatusBarItem::VCLXAccessibleStatusBarItem( StatusBar* pStatusBar,
 VCLXAccessibleStatusBarItem::~VCLXAccessibleStatusBarItem()
 {
     delete m_pExternalLock;
-    m_pExternalLock = NULL;
+    m_pExternalLock = nullptr;
 }
 
 
@@ -220,7 +220,7 @@ void VCLXAccessibleStatusBarItem::disposing()
 {
     AccessibleTextHelper_BASE::disposing();
 
-    m_pStatusBar = NULL;
+    m_pStatusBar = nullptr;
     m_sItemName.clear();
     m_sItemText.clear();
 }
@@ -594,7 +594,7 @@ sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32
             vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText );
 
             SolarMutexReleaser aReleaser;
-            xClipboard->setContents( pDataObj, NULL );
+            xClipboard->setContents( pDataObj, nullptr );
 
             Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
             if( xFlushableClipboard.is() )
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 5714d44fb8f6..417b898151ff 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -240,7 +240,7 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin
         {
             if ( m_pTabControl )
             {
-                m_pTabControl = NULL;
+                m_pTabControl = nullptr;
 
                 // dispose all tab pages
                 for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
@@ -323,7 +323,7 @@ void VCLXAccessibleTabControl::disposing()
 
     if ( m_pTabControl )
     {
-        m_pTabControl = NULL;
+        m_pTabControl = nullptr;
 
         // dispose all tab pages
         for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index f0bf4d36279b..f279e7dc0d22 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -64,7 +64,7 @@ VCLXAccessibleTabPage::VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt1
 VCLXAccessibleTabPage::~VCLXAccessibleTabPage()
 {
     delete m_pExternalLock;
-    m_pExternalLock = NULL;
+    m_pExternalLock = nullptr;
 }
 
 
@@ -253,7 +253,7 @@ void VCLXAccessibleTabPage::disposing()
 {
     AccessibleTextHelper_BASE::disposing();
 
-    m_pTabControl = NULL;
+    m_pTabControl = nullptr;
     m_sPageText.clear();
 }
 
@@ -667,7 +667,7 @@ sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI
             vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText );
 
             SolarMutexReleaser aReleaser;
-            xClipboard->setContents( pDataObj, NULL );
+            xClipboard->setContents( pDataObj, nullptr );
 
             Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
             if( xFlushableClipboard.is() )
diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index 3edb2b815864..bf6f51100bf7 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -37,7 +37,7 @@ VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindo
     :VCLXAccessibleComponent( pVCLXWindow )
 {
     m_pTabPage = static_cast< TabPage* >( GetWindow().get() );
-    m_pTabControl = 0;
+    m_pTabControl = nullptr;
     m_nPageId = 0;
     if ( m_pTabPage )
     {
@@ -94,8 +94,8 @@ void VCLXAccessibleTabPageWindow::disposing()
 {
     VCLXAccessibleComponent::disposing();
 
-    m_pTabControl = NULL;
-    m_pTabPage = NULL;
+    m_pTabControl = nullptr;
+    m_pTabPage = nullptr;
 }
 
 
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index d7fbfb05d853..f39446077de2 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -386,7 +386,7 @@ sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32
             vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText );
 
             SolarMutexReleaser aReleaser;
-            xClipboard->setContents( pDataObj, NULL );
+            xClipboard->setContents( pDataObj, nullptr );
 
             Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
             if( xFlushableClipboard.is() )
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 017a982b51ba..6176b7745e39 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -89,7 +89,7 @@ namespace
         inline sal_Int32    getIndexInParent() const                    { return m_nIndexInParent; }
         inline void         setIndexInParent( sal_Int32 _nNewIndex )    { m_nIndexInParent = _nNewIndex; }
 
-        static  bool    isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation = NULL );
+        static  bool    isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation = nullptr );
 
     public:
         OToolBoxWindowItem(sal_Int32 _nIndexInParent,
@@ -130,7 +130,7 @@ namespace
 
     bool OToolBoxWindowItem::isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation )
     {
-        OToolBoxWindowItem* pImplementation = NULL;
+        OToolBoxWindowItem* pImplementation = nullptr;
 
         Reference< XUnoTunnel > xTunnel( _rxAcc, UNO_QUERY );
         if ( xTunnel.is() )
@@ -139,12 +139,12 @@ namespace
         if ( _ppImplementation )
             *_ppImplementation = pImplementation;
 
-        return NULL != pImplementation;
+        return nullptr != pImplementation;
     }
 
     Sequence< sal_Int8 > OToolBoxWindowItem::getUnoTunnelImplementationId()
     {
-        static ::cppu::OImplementationId * pId = 0;
+        static ::cppu::OImplementationId * pId = nullptr;
         if (! pId)
         {
             ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
@@ -183,7 +183,7 @@ VCLXAccessibleToolBox::~VCLXAccessibleToolBox()
 
 VCLXAccessibleToolBoxItem* VCLXAccessibleToolBox::GetItem_Impl( sal_Int32 _nPos, bool _bMustHaveFocus )
 {
-    VCLXAccessibleToolBoxItem* pItem = NULL;
+    VCLXAccessibleToolBoxItem* pItem = nullptr;
     VclPtr< ToolBox > pToolBox = GetAs< ToolBox >();
     if ( pToolBox && ( !_bMustHaveFocus || pToolBox->HasFocus() ) )
     {
@@ -270,7 +270,7 @@ void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 _nPos )
     if ( pToolBox )
     {
         sal_uInt16 nFocusId = pToolBox->GetItemId( (sal_uInt16)_nPos );
-        VCLXAccessibleToolBoxItem* pFocusItem = NULL;
+        VCLXAccessibleToolBoxItem* pFocusItem = nullptr;
 
         for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
               aIter != m_aAccessibleChildren.end(); ++aIter )
@@ -319,7 +319,7 @@ void VCLXAccessibleToolBox::implReleaseToolboxItem( ToolBoxItemsMap::iterator& _
         NotifyAccessibleEvent( AccessibleEventId::CHILD, makeAny( xItemAcc ), Any() );
     }
 
-    OToolBoxWindowItem* pWindowItem = NULL;
+    OToolBoxWindowItem* pWindowItem = nullptr;
     if ( !OToolBoxWindowItem::isWindowItem( xItemAcc, &pWindowItem ) )
     {
         static_cast< VCLXAccessibleToolBoxItem* >( xItemAcc.get() )->ReleaseToolBox();
@@ -367,7 +367,7 @@ void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, bool _bItemAdded )
         {
             Reference< XAccessible > xItemAcc( aIndexAdjust->second );
 
-            OToolBoxWindowItem* pWindowItem = NULL;
+            OToolBoxWindowItem* pWindowItem = nullptr;
             if ( !OToolBoxWindowItem::isWindowItem( xItemAcc, &pWindowItem ) )
             {
                 VCLXAccessibleToolBoxItem* pItem = static_cast< VCLXAccessibleToolBoxItem* >( xItemAcc.get() );
@@ -755,7 +755,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal
         return xChild;
     }
 
-    return NULL;
+    return nullptr;
 }
 
 Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( const awt::Point& _rPoint ) throw (RuntimeException, std::exception)
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 35119e581910..e3d77e8e2076 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -118,7 +118,7 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In
 VCLXAccessibleToolBoxItem::~VCLXAccessibleToolBoxItem()
 {
     delete m_pExternalLock;
-    m_pExternalLock = NULL;
+    m_pExternalLock = nullptr;
 }
 
 OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName )
@@ -288,7 +288,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleToolBoxItem, AccessibleTextHelpe
 void SAL_CALL VCLXAccessibleToolBoxItem::disposing()
 {
     AccessibleTextHelper_BASE::disposing();
-    m_pToolBox = NULL;
+    m_pToolBox = nullptr;
 }
 
 // XServiceInfo
@@ -525,7 +525,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sa
             vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText );
 
             SolarMutexReleaser aReleaser;
-            xClipboard->setContents( pDataObj, NULL );
+            xClipboard->setContents( pDataObj, nullptr );
 
             Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
             if( xFlushableClipboard.is() )