16 files changed, 154 insertions, 154 deletions

diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 7077f77eb321..03e6a2c1de31 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -128,10 +128,10 @@ AccessibleControlShape::AccessibleControlShape (
 AccessibleControlShape::~AccessibleControlShape()
 {
     m_pChildManager->release();
-    m_pChildManager = NULL;
+    m_pChildManager = nullptr;
 
     if ( m_xControlContextProxy.is() )
-        m_xControlContextProxy->setDelegator( NULL );
+        m_xControlContextProxy->setDelegator( nullptr );
     m_xControlContextProxy.clear();
     m_xControlContextTypeAccess.clear();
     m_xControlContextComponent.clear();
@@ -903,7 +903,7 @@ AccessibleControlShape* SAL_CALL AccessibleControlShape::GetLabeledByControlShap
             }
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 61f4c1fefdef..58ce8a299b06 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -87,7 +87,7 @@ namespace accessibility
         // SvxEditSource
         SvxTextForwarder*       GetTextForwarder() override { return this; }
         SvxViewForwarder*       GetViewForwarder() override { return this; }
-        SvxEditSource*          Clone() const override { return NULL; }
+        SvxEditSource*          Clone() const override { return nullptr; }
         void                    UpdateData() override {}
         SfxBroadcaster&         GetBroadcaster() const override { return *(const_cast<AccessibleEmptyEditSource_Impl*>(this)); }
 
@@ -110,14 +110,14 @@ namespace accessibility
         SfxItemState    GetItemState( const ESelection& /*rSel*/, sal_uInt16 /*nWhich*/ ) const override { return SfxItemState::UNKNOWN; }
         SfxItemState    GetItemState( sal_Int32 /*nPara*/, sal_uInt16 /*nWhich*/ ) const override { return SfxItemState::UNKNOWN; }
 
-        SfxItemPool*    GetPool() const override { return NULL; }
+        SfxItemPool*    GetPool() const override { return nullptr; }
 
         void            QuickInsertText( const OUString& /*rText*/, const ESelection& /*rSel*/ ) override {}
         void            QuickInsertField( const SvxFieldItem& /*rFld*/, const ESelection& /*rSel*/ ) override {}
         void            QuickSetAttribs( const SfxItemSet& /*rSet*/, const ESelection& /*rSel*/ ) override {}
         void            QuickInsertLineBreak( const ESelection& /*rSel*/ ) override {}
 
-        const SfxItemSet * GetEmptyItemSetPtr() override { return 0; }
+        const SfxItemSet * GetEmptyItemSetPtr() override { return nullptr; }
 
         void        AppendParagraph() override {}
         sal_Int32  AppendTextPortion( sal_Int32 /*nPara*/, const OUString & /*rText*/, const SfxItemSet & /*rSet*/ ) override { return 0; }
@@ -140,7 +140,7 @@ namespace accessibility
         Rectangle       GetCharBounds( sal_Int32, sal_Int32 ) const override { return Rectangle(); }
         Rectangle       GetParaBounds( sal_Int32 ) const override { return Rectangle(); }
         MapMode         GetMapMode() const override { return MapMode(); }
-        OutputDevice*   GetRefDevice() const override { return NULL; }
+        OutputDevice*   GetRefDevice() const override { return nullptr; }
         bool            GetIndexAtPoint( const Point&, sal_Int32&, sal_Int32& ) const override { return false; }
         bool            GetWordIndices( sal_Int32, sal_Int32, sal_Int32&, sal_Int32& ) const override { return false; }
         bool            GetAttributeRun( sal_Int32&, sal_Int32&, sal_Int32, sal_Int32, bool ) const override { return false; }
@@ -176,7 +176,7 @@ namespace accessibility
     AccessibleProxyEditSource_Impl::AccessibleProxyEditSource_Impl( SdrObject&      rObj,
                                                                     SdrView&        rView,
                                                                     const vcl::Window&   rViewWindow ) :
-        maEditSource( rObj, 0, rView, rViewWindow )
+        maEditSource( rObj, nullptr, rView, rViewWindow )
     {
     }
 
@@ -250,7 +250,7 @@ namespace accessibility
     SvxTextForwarder* AccessibleEmptyEditSource::GetTextForwarder()
     {
         if( !mpEditSource.get() )
-            return NULL;
+            return nullptr;
 
         return mpEditSource->GetTextForwarder();
     }
@@ -258,7 +258,7 @@ namespace accessibility
     SvxViewForwarder* AccessibleEmptyEditSource::GetViewForwarder()
     {
         if( !mpEditSource.get() )
-            return NULL;
+            return nullptr;
 
         return mpEditSource->GetViewForwarder();
     }
@@ -282,7 +282,7 @@ namespace accessibility
     SvxEditViewForwarder* AccessibleEmptyEditSource::GetEditViewForwarder( bool bCreate )
     {
         if( !mpEditSource.get() )
-            return NULL;
+            return nullptr;
 
         // switch edit source, if not yet done
         if( mbEditSourceEmpty && bCreate )
@@ -294,7 +294,7 @@ namespace accessibility
     SvxEditSource* AccessibleEmptyEditSource::Clone() const
     {
         if( !mpEditSource.get() )
-            return NULL;
+            return nullptr;
 
         return mpEditSource->Clone();
     }
@@ -323,11 +323,11 @@ namespace accessibility
             if( mbEditSourceEmpty )
                 Switch2ProxyEditSource();
         }
-        else if (pSdrHint && pSdrHint->GetObject()!=NULL)
+        else if (pSdrHint && pSdrHint->GetObject()!=nullptr)
         {
             // When the SdrObject just got a para outliner object then
             // switch the edit source.
-            if (pSdrHint->GetObject()->GetOutlinerParaObject() != NULL)
+            if (pSdrHint->GetObject()->GetOutlinerParaObject() != nullptr)
                 Switch2ProxyEditSource();
         }
 
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 9cc6b776bbef..3a85aa885a4d 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -549,7 +549,7 @@ void AccFrameSelector::NotifyAccessibleEvent( const sal_Int16 _nEventId,
 void AccFrameSelector::Invalidate()
 {
     RemoveFrameSelEventListener();
-    mpFrameSel = 0;
+    mpFrameSel = nullptr;
     EventObject aEvent;
     Reference < XAccessibleContext > xThis( this );
     aEvent.Source = xThis;
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index f5675824ee7d..c75bad34685c 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -190,7 +190,7 @@ OUString AccessibleGraphicShape::CreateAccessibleDescription()
 sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole()
         throw (css::uno::RuntimeException, std::exception)
 {
-    if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != NULL )
+    if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != nullptr )
         return AccessibleRole::IMAGE_MAP;
     else
         return AccessibleShape::getAccessibleRole();
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 586521aa53f1..310ef4979533 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -102,12 +102,12 @@ AccessibleShape::AccessibleShape (
     const AccessibleShapeInfo& rShapeInfo,
     const AccessibleShapeTreeInfo& rShapeTreeInfo)
     : AccessibleContextBase (rShapeInfo.mxParent,AccessibleRole::SHAPE),
-      mpChildrenManager(NULL),
+      mpChildrenManager(nullptr),
       mxShape (rShapeInfo.mxShape),
       maShapeTreeInfo (rShapeTreeInfo),
       mnIndex (rShapeInfo.mnIndex),
       m_nIndexInParent(-1),
-      mpText (NULL),
+      mpText (nullptr),
       mpParent (rShapeInfo.mpChildrenManager)
 {
     m_pShape = GetSdrObjectFromXShape(mxShape);
@@ -135,7 +135,7 @@ void AccessibleShape::Init()
     if (xShapes.is() && xShapes->getCount() > 0)
         mpChildrenManager = new ChildrenManager (
             this, xShapes, maShapeTreeInfo, *this);
-    if (mpChildrenManager != NULL)
+    if (mpChildrenManager != nullptr)
         mpChildrenManager->Update();
 
     // Register at model as document::XEventListener.
@@ -151,19 +151,19 @@ void AccessibleShape::Init()
     {
         SdrView* pView = maShapeTreeInfo.GetSdrView ();
         const vcl::Window* pWindow = maShapeTreeInfo.GetWindow ();
-        if (pView != NULL && pWindow != NULL && mxShape.is())
+        if (pView != nullptr && pWindow != nullptr && mxShape.is())
         {
             // #107948# Determine whether shape text is empty
             SdrObject* pSdrObject = GetSdrObjectFromXShape(mxShape);
             if( pSdrObject )
             {
                 SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>( pSdrObject  );
-                OutlinerParaObject* pOutlinerParaObject = NULL;
+                OutlinerParaObject* pOutlinerParaObject = nullptr;
 
                 if( pTextObj )
                     pOutlinerParaObject = pTextObj->GetEditOutlinerParaObject(); // Get the OutlinerParaObject if text edit is active
 
-                bool bOwnParaObj = pOutlinerParaObject != NULL;
+                bool bOwnParaObj = pOutlinerParaObject != nullptr;
 
                 if( !pOutlinerParaObject && pSdrObject )
                     pOutlinerParaObject = pSdrObject->GetOutlinerParaObject();
@@ -178,7 +178,7 @@ void AccessibleShape::Init()
                 else
                 {
                     // non-empty text -> use full-fledged edit source right away
-                    ::std::unique_ptr<SvxEditSource> pEditSource( new SvxTextEditSource ( *pSdrObject, 0, *pView, *pWindow) );
+                    ::std::unique_ptr<SvxEditSource> pEditSource( new SvxTextEditSource ( *pSdrObject, nullptr, *pView, *pWindow) );
                     mpText = new AccessibleTextHelper( std::move(pEditSource) );
                 }
 
@@ -198,7 +198,7 @@ void AccessibleShape::UpdateStates()
 {
     ::utl::AccessibleStateSetHelper* pStateSet =
         static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
-    if (pStateSet == NULL)
+    if (pStateSet == nullptr)
         return;
 
     // Set the opaque state for certain shape types when their fill style is
@@ -262,7 +262,7 @@ bool AccessibleShape::SetState (sal_Int16 aState)
 {
     bool bStateHasChanged = false;
 
-    if (aState == AccessibleStateType::FOCUSED && mpText != NULL)
+    if (aState == AccessibleStateType::FOCUSED && mpText != nullptr)
     {
         // Offer FOCUSED state to edit engine and detect whether the state
         // changes.
@@ -283,7 +283,7 @@ bool AccessibleShape::ResetState (sal_Int16 aState)
 {
     bool bStateHasChanged = false;
 
-    if (aState == AccessibleStateType::FOCUSED && mpText != NULL)
+    if (aState == AccessibleStateType::FOCUSED && mpText != nullptr)
     {
         // Try to remove FOCUSED state from the edit engine and detect
         // whether the state changes.
@@ -302,7 +302,7 @@ bool AccessibleShape::ResetState (sal_Int16 aState)
 
 bool AccessibleShape::GetState (sal_Int16 aState)
 {
-    if (aState == AccessibleStateType::FOCUSED && mpText != NULL)
+    if (aState == AccessibleStateType::FOCUSED && mpText != nullptr)
     {
         // Just delegate the call to the edit engine.  The state is not
         // merged into the state set.
@@ -345,10 +345,10 @@ sal_Int32 SAL_CALL
     sal_Int32 nChildCount = 0;
 
     // Add the number of shapes that are children of this shape.
-    if (mpChildrenManager != NULL)
+    if (mpChildrenManager != nullptr)
         nChildCount += mpChildrenManager->GetChildCount ();
     // Add the number text paragraphs.
-    if (mpText != NULL)
+    if (mpText != nullptr)
         nChildCount += mpText->GetChildCount ();
 
     return nChildCount;
@@ -370,15 +370,15 @@ uno::Reference<XAccessible> SAL_CALL
 
     // Depending on the index decide whether to delegate this call to the
     // children manager or the edit engine.
-    if ((mpChildrenManager != NULL)
+    if ((mpChildrenManager != nullptr)
         && (nIndex < mpChildrenManager->GetChildCount()))
     {
         xChild = mpChildrenManager->GetChild (nIndex);
     }
-    else if (mpText != NULL)
+    else if (mpText != nullptr)
     {
         sal_Int32 nI = nIndex;
-        if (mpChildrenManager != NULL)
+        if (mpChildrenManager != nullptr)
             nI -= mpChildrenManager->GetChildCount();
         xChild = mpText->GetChild (nI);
     }
@@ -395,7 +395,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL
         throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
-    if (mpParent == NULL)
+    if (mpParent == nullptr)
         return uno::Reference<XAccessibleRelationSet>();
 
     ::utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper;
@@ -423,7 +423,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
     ::osl::MutexGuard aGuard (maMutex);
     Reference<XAccessibleStateSet> xStateSet;
 
-    if (rBHelper.bDisposed || mpText == NULL)
+    if (rBHelper.bDisposed || mpText == nullptr)
         // Return a minimal state set that only contains the DEFUNC state.
     {
         xStateSet = AccessibleContextBase::getAccessibleStateSet ();
@@ -461,10 +461,10 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
         ::utl::AccessibleStateSetHelper* pStateSet =
               static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
 
-        if (pStateSet != NULL)
+        if (pStateSet != nullptr)
         {
             // Merge current FOCUSED state from edit engine.
-            if (mpText != NULL)
+            if (mpText != nullptr)
             {
                 if (mpText->HaveFocus())
                     pStateSet->AddState (AccessibleStateType::FOCUSED);
@@ -619,7 +619,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds()
         }
 
         // Transform coordinates from internal to pixel.
-        if (maShapeTreeInfo.GetViewForwarder() == NULL)
+        if (maShapeTreeInfo.GetViewForwarder() == nullptr)
             throw uno::RuntimeException (OUString (
                 "AccessibleShape has no valid view forwarder"),
                 static_cast<uno::XWeak*>(this));
@@ -789,7 +789,7 @@ void SAL_CALL AccessibleShape::addAccessibleEventListener (
     else
     {
         AccessibleContextBase::addAccessibleEventListener (rxListener);
-        if (mpText != NULL)
+        if (mpText != nullptr)
             mpText->AddEventListener (rxListener);
     }
 }
@@ -802,7 +802,7 @@ void SAL_CALL AccessibleShape::removeAccessibleEventListener (
     throw (uno::RuntimeException, std::exception)
 {
     AccessibleContextBase::removeAccessibleEventListener (rxListener);
-    if (mpText != NULL)
+    if (mpText != nullptr)
         mpText->RemoveEventListener (rxListener);
 }
 
@@ -1042,7 +1042,7 @@ void SAL_CALL
         {
             // Remove reference to model broadcaster to allow it to pass
             // away.
-            maShapeTreeInfo.SetModelBroadcaster(NULL);
+            maShapeTreeInfo.SetModelBroadcaster(nullptr);
         }
 
     }
@@ -1102,7 +1102,7 @@ AccessibleShape*
     throw()
 {
     uno::Reference< lang::XUnoTunnel >  xTunnel( rxIFace, uno::UNO_QUERY );
-    AccessibleShape*                    pReturn = NULL;
+    AccessibleShape*                    pReturn = nullptr;
 
     if( xTunnel.is() )
         pReturn = reinterpret_cast< AccessibleShape* >( xTunnel->getSomething( getUnoTunnelImplementationId() ) );
@@ -1134,7 +1134,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType,
         uno::Any());
 
     // Tell children manager of the modified view forwarder.
-    if (mpChildrenManager != NULL)
+    if (mpChildrenManager != nullptr)
         mpChildrenManager->ViewForwarderChanged (aChangeType, pViewForwarder);
 
     // update our children that our screen position might have changed
@@ -1273,7 +1273,7 @@ void AccessibleShape::disposing()
     // case that it has the focus.
     ::utl::AccessibleStateSetHelper* pStateSet =
           static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
-    if (pStateSet != NULL)
+    if (pStateSet != nullptr)
         pStateSet->RemoveState (AccessibleStateType::FOCUSED);
 
     // Unregister from broadcasters.
@@ -1287,21 +1287,21 @@ void AccessibleShape::disposing()
             static_cast<document::XEventListener*>(this));
 
     // Release the child containers.
-    if (mpChildrenManager != NULL)
+    if (mpChildrenManager != nullptr)
     {
         delete mpChildrenManager;
-        mpChildrenManager = NULL;
+        mpChildrenManager = nullptr;
     }
-    if (mpText != NULL)
+    if (mpText != nullptr)
     {
         mpText->Dispose();
         delete mpText;
-        mpText = NULL;
+        mpText = nullptr;
     }
 
     // Cleanup.  Remove references to objects to allow them to be
     // destroyed.
-    mxShape = NULL;
+    mxShape = nullptr;
     maShapeTreeInfo = AccessibleShapeTreeInfo();
 
     // Call base classes.
@@ -1430,7 +1430,7 @@ throw (uno::RuntimeException, std::exception)
     SdrObject *pObj = GetSdrObjectFromXShape(mxShape);
 
 
-    if(pObj == NULL )
+    if(pObj == nullptr )
     {
         return aRet;
     }
@@ -1462,7 +1462,7 @@ throw (uno::RuntimeException, std::exception)
         return aRet;
     }
 
-    SdrObjList *pGrpList = NULL;
+    SdrObjList *pGrpList = nullptr;
     if( pObj->GetUpGroup() )
         pGrpList = pObj->GetUpGroup()->GetSubList();
     else
@@ -1510,7 +1510,7 @@ OUString AccessibleShape::getObjectLink( const uno::Any& )
     OUString aRet;
 
     SdrObject *pObj = GetSdrObjectFromXShape(mxShape);
-    if(pObj == NULL )
+    if(pObj == nullptr )
     {
         return aRet;
     }
diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx
index 8ecbdfd146c2..bc681c08324d 100644
--- a/svx/source/accessibility/AccessibleShapeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeInfo.cxx
@@ -44,7 +44,7 @@ AccessibleShapeInfo::AccessibleShapeInfo (
         sal_Int32 nIndex)
     : mxShape (rxShape),
       mxParent (rxParent),
-      mpChildrenManager (NULL),
+      mpChildrenManager (nullptr),
       mnIndex (nIndex)
 {
     // empty.
diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
index b141ce88d64a..1576ecf72c01 100644
--- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
@@ -29,9 +29,9 @@ using ::com::sun::star::uno::Reference;
 namespace accessibility {
 
 AccessibleShapeTreeInfo::AccessibleShapeTreeInfo()
-    : mpView (NULL),
-      mpWindow (NULL),
-      mpViewForwarder (NULL)
+    : mpView (nullptr),
+      mpWindow (nullptr),
+      mpViewForwarder (nullptr)
 {
     // Empty.
 }
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 7464cf8426f9..d7e673079b6f 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -243,7 +243,7 @@ namespace accessibility
     };
 
     AccessibleTextHelper_Impl::AccessibleTextHelper_Impl() :
-        mxFrontEnd( NULL ),
+        mxFrontEnd( nullptr ),
         maLastSelection( EE_PARA_NOT_FOUND,EE_INDEX_NOT_FOUND,EE_PARA_NOT_FOUND,EE_INDEX_NOT_FOUND ),
         mnFirstVisibleChild( -1 ),
         mnLastVisibleChild( -2 ),
@@ -1514,7 +1514,7 @@ namespace accessibility
 
         // clear references
         maEditSource.SetEditSource( ::std::unique_ptr< SvxEditSource >() );
-        mxFrontEnd = NULL;
+        mxFrontEnd = nullptr;
     }
 
     void AccessibleTextHelper_Impl::FireEvent( const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue ) const
@@ -1573,7 +1573,7 @@ namespace accessibility
         if( mxFrontEnd.is() )
             return maParaManager.CreateChild( i, mxFrontEnd, GetEditSource(), mnFirstVisibleChild + i ).first;
         else
-            return NULL;
+            return nullptr;
     }
 
     void SAL_CALL AccessibleTextHelper_Impl::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
@@ -1640,7 +1640,7 @@ namespace accessibility
         }
 
         // found none
-        return NULL;
+        return nullptr;
     }
 
 
diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx
index 49f193e0f4c4..be9dae16dc8a 100644
--- a/svx/source/accessibility/ChildrenManager.cxx
+++ b/svx/source/accessibility/ChildrenManager.cxx
@@ -33,14 +33,14 @@ ChildrenManager::ChildrenManager (
     const css::uno::Reference<drawing::XShapes>& rxShapeList,
     const AccessibleShapeTreeInfo& rShapeTreeInfo,
     AccessibleContextBase& rContext)
-    : mpImpl (NULL)
+    : mpImpl (nullptr)
 {
     mpImpl = new ChildrenManagerImpl (rxParent, rxShapeList, rShapeTreeInfo, rContext);
-    if (mpImpl != NULL)
+    if (mpImpl != nullptr)
         mpImpl->Init ();
     else
         throw uno::RuntimeException(
-            "ChildrenManager::ChildrenManager can't create implementation object", NULL);
+            "ChildrenManager::ChildrenManager can't create implementation object", nullptr);
 }
 
 
@@ -48,7 +48,7 @@ ChildrenManager::ChildrenManager (
 
 ChildrenManager::~ChildrenManager()
 {
-    if (mpImpl != NULL)
+    if (mpImpl != nullptr)
         mpImpl->dispose();
 
     // emtpy
@@ -57,7 +57,7 @@ ChildrenManager::~ChildrenManager()
 
 long ChildrenManager::GetChildCount() const throw ()
 {
-    assert(mpImpl != NULL);
+    assert(mpImpl != nullptr);
     return mpImpl->GetChildCount();
 }
 
@@ -65,14 +65,14 @@ css::uno::Reference<XAccessible> ChildrenManager::GetChild (long nIndex)
     throw (css::uno::RuntimeException,
            css::lang::IndexOutOfBoundsException)
 {
-    assert(mpImpl != NULL);
+    assert(mpImpl != nullptr);
     return mpImpl->GetChild (nIndex);
 }
 
 Reference<XAccessible> ChildrenManager::GetChild (const Reference<drawing::XShape>& xShape)
     throw (css::uno::RuntimeException)
 {
-    assert(mpImpl != NULL);
+    assert(mpImpl != nullptr);
     return mpImpl->GetChild (xShape);
 }
 
@@ -80,55 +80,55 @@ css::uno::Reference<css::drawing::XShape> ChildrenManager::GetChildShape(long nI
     throw (css::uno::RuntimeException,
            css::lang::IndexOutOfBoundsException)
 {
-    assert(mpImpl != NULL);
+    assert(mpImpl != nullptr);
     return mpImpl->GetChildShape(nIndex);
 }
 
 void ChildrenManager::Update (bool bCreateNewObjectsOnDemand)
 {
-    assert(mpImpl != NULL);
+    assert(mpImpl != nullptr);
     mpImpl->Update (bCreateNewObjectsOnDemand);
 }
 
 void ChildrenManager::SetShapeList (const css::uno::Reference<css::drawing::XShapes>& xShapeList)
 {
-    assert(mpImpl != NULL);
+    assert(mpImpl != nullptr);
     mpImpl->SetShapeList (xShapeList);
 }
 
 void ChildrenManager::AddAccessibleShape (css::uno::Reference<css::accessibility::XAccessible> const & shape)
 {
-    assert(mpImpl != NULL);
+    assert(mpImpl != nullptr);
     mpImpl->AddAccessibleShape (shape);
 }
 
 void ChildrenManager::ClearAccessibleShapeList()
 {
-    assert(mpImpl != NULL);
+    assert(mpImpl != nullptr);
     mpImpl->ClearAccessibleShapeList ();
 }
 
 void ChildrenManager::SetInfo (AccessibleShapeTreeInfo& rShapeTreeInfo)
 {
-    assert(mpImpl != NULL);
+    assert(mpImpl != nullptr);
     mpImpl->SetInfo (rShapeTreeInfo);
 }
 
 void ChildrenManager::UpdateSelection()
 {
-    assert(mpImpl != NULL);
+    assert(mpImpl != nullptr);
     mpImpl->UpdateSelection ();
 }
 
 bool ChildrenManager::HasFocus()
 {
-    assert(mpImpl != NULL);
+    assert(mpImpl != nullptr);
     return mpImpl->HasFocus ();
 }
 
 void ChildrenManager::RemoveFocus()
 {
-    assert(mpImpl != NULL);
+    assert(mpImpl != nullptr);
     mpImpl->RemoveFocus ();
 }
 
@@ -136,7 +136,7 @@ void ChildrenManager::RemoveFocus()
 void ChildrenManager::ViewForwarderChanged (ChangeType aChangeType,
         const IAccessibleViewForwarder* pViewForwarder)
 {
-    assert(mpImpl != NULL);
+    assert(mpImpl != nullptr);
     mpImpl->ViewForwarderChanged (aChangeType, pViewForwarder);
 }
 
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 0a01bedeb7c7..7c1e4491b75d 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -66,7 +66,7 @@ ChildrenManagerImpl::ChildrenManagerImpl (
       maShapeTreeInfo (rShapeTreeInfo),
       mrContext (rContext),
       mnNewNameIndex(1),
-      mpFocusedShape(NULL)
+      mpFocusedShape(nullptr)
 {
 }
 
@@ -216,7 +216,7 @@ uno::Reference<XAccessible>
 */
 void ChildrenManagerImpl::Update (bool bCreateNewObjectsOnDemand)
 {
-    if (maShapeTreeInfo.GetViewForwarder() == NULL)
+    if (maShapeTreeInfo.GetViewForwarder() == nullptr)
         return;
     Rectangle aVisibleArea = maShapeTreeInfo.GetViewForwarder()->GetVisibleArea();
 
@@ -295,7 +295,7 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes (
 {
     SolarMutexGuard g;
 
-    OSL_ASSERT (maShapeTreeInfo.GetViewForwarder() != NULL);
+    OSL_ASSERT (maShapeTreeInfo.GetViewForwarder() != nullptr);
 
     Rectangle aVisibleArea = maShapeTreeInfo.GetViewForwarder()->GetVisibleArea();
 
@@ -376,7 +376,7 @@ void ChildrenManagerImpl::RemoveNonVisibleChildren (
             {
                 AccessibleShape* pAccessibleShape = I->GetAccessibleShape();
                 pAccessibleShape->ResetState (AccessibleStateType::VISIBLE);
-                I->mxAccessibleShape = NULL;
+                I->mxAccessibleShape = nullptr;
             }
         }
     }
@@ -421,7 +421,7 @@ void ChildrenManagerImpl::SendVisibleAreaEvents (
         // change of the view forwarder.  (Actually we usually get here
         // as a result of a change of the view forwarder).
         AccessibleShape* pShape = I->GetAccessibleShape ();
-        if (pShape != NULL)
+        if (pShape != nullptr)
             pShape->ViewForwarderChanged (
                 IAccessibleViewForwarderListener::VISIBLE_AREA,
                 maShapeTreeInfo.GetViewForwarder());
@@ -583,7 +583,7 @@ void ChildrenManagerImpl::ClearAccessibleShapeList()
         if ( I->mxAccessibleShape.is() && I->mxShape.is() )
         {
             ::comphelper::disposeComponent(I->mxAccessibleShape);
-            I->mxAccessibleShape = NULL;
+            I->mxAccessibleShape = nullptr;
         }
 
     // Dispose all objects in the accessible shape list.
@@ -593,7 +593,7 @@ void ChildrenManagerImpl::ClearAccessibleShapeList()
         {
             // Dispose the object.
             ::comphelper::disposeComponent(*J);
-            *J = NULL;
+            *J = nullptr;
         }
 }
 
@@ -683,7 +683,7 @@ void SAL_CALL
         {
             // Clear the descriptor.
             I->disposeAccessibleObject (mrContext);
-            I->mxShape = NULL;
+            I->mxShape = nullptr;
         }
     }
 }
@@ -744,7 +744,7 @@ void ChildrenManagerImpl::impl_dispose()
     catch( uno::RuntimeException&)
     {}
 
-    maShapeTreeInfo.SetController (NULL);
+    maShapeTreeInfo.SetController (nullptr);
 
     try
     {
@@ -752,13 +752,13 @@ void ChildrenManagerImpl::impl_dispose()
         if (maShapeTreeInfo.GetModelBroadcaster().is())
             maShapeTreeInfo.GetModelBroadcaster()->removeEventListener (
                 static_cast<document::XEventListener*>(this));
-        maShapeTreeInfo.SetModelBroadcaster (NULL);
+        maShapeTreeInfo.SetModelBroadcaster (nullptr);
     }
     catch( uno::RuntimeException& )
     {}
 
     ClearAccessibleShapeList ();
-    SetShapeList (NULL);
+    SetShapeList (nullptr);
 }
 
 
@@ -781,7 +781,7 @@ void ChildrenManagerImpl::ViewForwarderChanged (ChangeType aChangeType,
         for (I=maVisibleChildren.begin(); I != aEnd; ++I)
         {
             AccessibleShape* pShape = I->GetAccessibleShape();
-            if (pShape != NULL)
+            if (pShape != nullptr)
                 pShape->ViewForwarderChanged (aChangeType, pViewForwarder);
         }
     }
@@ -855,7 +855,7 @@ AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(css::b
                 return pCtlAccShape;
                 }
     }
-    return NULL;
+    return nullptr;
 }
 uno::Reference<XAccessible>
     ChildrenManagerImpl::GetAccessibleCaption (const uno::Reference<drawing::XShape>& xShape)
@@ -897,8 +897,8 @@ void ChildrenManagerImpl::UpdateSelection()
     }
 
     // Remember the current and new focused shape.
-    AccessibleShape* pCurrentlyFocusedShape = NULL;
-    AccessibleShape* pNewFocusedShape = NULL;
+    AccessibleShape* pCurrentlyFocusedShape = nullptr;
+    AccessibleShape* pNewFocusedShape = nullptr;
     typedef std::pair< AccessibleShape* , sal_Bool > PAIR_SHAPE;//sal_Bool Selected,UnSelected.
     typedef std::vector< PAIR_SHAPE > VEC_SHAPE;
     VEC_SHAPE vecSelect;
@@ -909,7 +909,7 @@ void ChildrenManagerImpl::UpdateSelection()
     for (I=maVisibleChildren.begin(); I != aEnd; ++I)
     {
         AccessibleShape* pAccessibleShape = I->GetAccessibleShape();
-        if (I->mxAccessibleShape.is() && I->mxShape.is() && pAccessibleShape!=NULL)
+        if (I->mxAccessibleShape.is() && I->mxShape.is() && pAccessibleShape!=nullptr)
         {
             short nRole = pAccessibleShape->getAccessibleRole();
             bool bDrawShape = (
@@ -989,9 +989,9 @@ void ChildrenManagerImpl::UpdateSelection()
     // Move focus from current to newly focused shape.
     if (pCurrentlyFocusedShape != pNewFocusedShape)
     {
-        if (pCurrentlyFocusedShape != NULL)
+        if (pCurrentlyFocusedShape != nullptr)
             pCurrentlyFocusedShape->ResetState (AccessibleStateType::FOCUSED);
-        if (pNewFocusedShape != NULL && bShapeActive)
+        if (pNewFocusedShape != nullptr && bShapeActive)
             pNewFocusedShape->SetState (AccessibleStateType::FOCUSED);
     }
 
@@ -1048,7 +1048,7 @@ void ChildrenManagerImpl::UpdateSelection()
 
 bool ChildrenManagerImpl::HasFocus()
 {
-    return mpFocusedShape != NULL;
+    return mpFocusedShape != nullptr;
 }
 
 
@@ -1056,10 +1056,10 @@ bool ChildrenManagerImpl::HasFocus()
 
 void ChildrenManagerImpl::RemoveFocus()
 {
-    if (mpFocusedShape != NULL)
+    if (mpFocusedShape != nullptr)
     {
         mpFocusedShape->ResetState (AccessibleStateType::FOCUSED);
-        mpFocusedShape = NULL;
+        mpFocusedShape = nullptr;
     }
 }
 
@@ -1089,7 +1089,7 @@ void ChildrenManagerImpl::UnregisterAsDisposeListener (
 // AccessibleChildDescriptor
 ChildDescriptor::ChildDescriptor (const Reference<drawing::XShape>& xShape)
     : mxShape (xShape),
-      mxAccessibleShape (NULL),
+      mxAccessibleShape (nullptr),
       mbCreateEventPending (true)
 {
     // Empty.
@@ -1099,7 +1099,7 @@ ChildDescriptor::ChildDescriptor (const Reference<drawing::XShape>& xShape)
 
 
 ChildDescriptor::ChildDescriptor (const Reference<XAccessible>& rxAccessibleShape)
-    : mxShape (NULL),
+    : mxShape (nullptr),
       mxAccessibleShape (rxAccessibleShape),
       mbCreateEventPending (true)
 {
@@ -1152,7 +1152,7 @@ void ChildDescriptor::disposeAccessibleObject (AccessibleContextBase& rParent)
         if (xComponent.is())
             xComponent->dispose ();
 
-        mxAccessibleShape = NULL;
+        mxAccessibleShape = nullptr;
     }
 }
 
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 7bed55b7f3bf..0aa17dbce2df 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -70,27 +70,27 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext(
     SvxGraphCtrlAccessibleContext_Base( m_aMutex ),
     mxParent( rxParent ),
     mpControl( &rRepr ),
-    mpModel (NULL),
-    mpPage (NULL),
-    mpView (NULL),
+    mpModel (nullptr),
+    mpPage (nullptr),
+    mpView (nullptr),
     mnClientId( 0 ),
     mbDisposed( false )
 {
     if (mpControl != nullptr)
     {
         mpModel = mpControl->GetSdrModel();
-        if (mpModel != NULL)
+        if (mpModel != nullptr)
             mpPage = mpModel->GetPage( 0 );
         mpView = mpControl->GetSdrView();
 
-        if( mpModel == NULL || mpPage == NULL || mpView == NULL )
+        if( mpModel == nullptr || mpPage == nullptr || mpView == nullptr )
         {
             mbDisposed = true;
             // Set all the pointers to NULL just in case they are used as
             // a disposed flag.
-            mpModel = NULL;
-            mpPage = NULL;
-            mpView = NULL;
+            mpModel = nullptr;
+            mpPage = nullptr;
+            mpView = nullptr;
         }
     }
 
@@ -201,11 +201,11 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAt
         Point aPnt( rPoint.X, rPoint.Y );
         mpControl->PixelToLogic( aPnt );
 
-        SdrObject* pObj = 0;
+        SdrObject* pObj = nullptr;
 
         if(mpView && mpView->GetSdrPageView())
         {
-            pObj = SdrObjListPrimitiveHit(*mpPage, aPnt, 1, *mpView->GetSdrPageView(), 0, false);
+            pObj = SdrObjListPrimitiveHit(*mpPage, aPnt, 1, *mpView->GetSdrPageView(), nullptr, false);
         }
 
         if( pObj )
@@ -265,7 +265,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() thro
 {
     ::SolarMutexGuard aGuard;
 
-    if( NULL == mpPage )
+    if( nullptr == mpPage )
         throw DisposedException();
 
     return mpPage->GetObjCount();
@@ -279,7 +279,7 @@ SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex )
 {
     ::SolarMutexGuard aGuard;
 
-    if( NULL == mpPage )
+    if( nullptr == mpPage )
         throw DisposedException();
 
     if( (nIndex < 0) || ( static_cast<size_t>(nIndex) >= mpPage->GetObjCount() ) )
@@ -535,7 +535,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nI
 {
     ::SolarMutexGuard aGuard;
 
-    if( NULL == mpView )
+    if( nullptr == mpView )
         throw DisposedException();
 
     SdrObject* pObj = getSdrObject( nIndex );
@@ -550,7 +550,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_
 {
     ::SolarMutexGuard aGuard;
 
-    if( NULL == mpView )
+    if( nullptr == mpView )
         throw DisposedException();
 
     return mpView->IsObjMarked( getSdrObject( nIndex ) );
@@ -562,7 +562,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( R
 {
     ::SolarMutexGuard aGuard;
 
-    if( NULL == mpView )
+    if( nullptr == mpView )
         throw DisposedException();
 
     mpView->UnmarkAllObj();
@@ -574,7 +574,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw
 {
     ::SolarMutexGuard aGuard;
 
-    if( NULL == mpView )
+    if( nullptr == mpView )
         throw DisposedException();
 
     mpView->MarkAllObj();
@@ -586,7 +586,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun
 {
     ::SolarMutexGuard aGuard;
 
-    if( NULL == mpView )
+    if( nullptr == mpView )
         throw DisposedException();
 
     const SdrMarkList& rList = mpView->GetMarkedObjectList();
@@ -661,19 +661,19 @@ void SvxGraphCtrlAccessibleContext::setModelAndView (
     ::SolarMutexGuard aGuard;
 
     mpModel = pModel;
-    if (mpModel != NULL)
+    if (mpModel != nullptr)
         mpPage = mpModel->GetPage( 0 );
     mpView = pView;
 
-    if (mpModel == NULL || mpPage == NULL || mpView == NULL)
+    if (mpModel == nullptr || mpPage == nullptr || mpView == nullptr)
     {
         mbDisposed = true;
 
         // Set all the pointers to NULL just in case they are used as
         // a disposed flag.
-        mpModel = NULL;
-        mpPage = NULL;
-        mpView = NULL;
+        mpModel = nullptr;
+        mpPage = nullptr;
+        mpView = nullptr;
     }
 
     maTreeInfo.SetSdrView (mpView);
@@ -692,9 +692,9 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing()
 
     mbDisposed = true;
 
-    mpControl = NULL;       // object dies with representation
-    mpView = NULL;
-    mpPage = NULL;
+    mpControl = nullptr;       // object dies with representation
+    mpView = nullptr;
+    mpPage = nullptr;
 
     {
         ShapesMapType::iterator I;
@@ -746,13 +746,13 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox() throw( RuntimeExceptio
     Rectangle aBounds ( 0, 0, 0, 0 );
 
     vcl::Window* pWindow = mpControl;
-    if (pWindow != NULL)
+    if (pWindow != nullptr)
     {
-        aBounds = pWindow->GetWindowExtentsRelative (NULL);
+        aBounds = pWindow->GetWindowExtentsRelative (nullptr);
         vcl::Window* pParent = pWindow->GetAccessibleParentWindow();
-        if (pParent != NULL)
+        if (pParent != nullptr)
         {
-            Rectangle aParentRect = pParent->GetWindowExtentsRelative (NULL);
+            Rectangle aParentRect = pParent->GetWindowExtentsRelative (nullptr);
             aBounds -= aParentRect.TopLeft();
         }
     }
@@ -830,7 +830,7 @@ Point SvxGraphCtrlAccessibleContext::LogicToPixel (const Point& rPoint) const
 {
     if( mpControl )
     {
-        Rectangle aBBox(mpControl->GetWindowExtentsRelative(NULL));
+        Rectangle aBBox(mpControl->GetWindowExtentsRelative(nullptr));
         return mpControl->LogicToPixel (rPoint) + aBBox.TopLeft();
     }
     else
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index bacd47c1ad9a..c6e27664044d 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::accessibility;
 namespace accessibility {
 
 // Pointer to the shape type handler singleton.
-ShapeTypeHandler* ShapeTypeHandler::instance = NULL;
+ShapeTypeHandler* ShapeTypeHandler::instance = nullptr;
 
 
 // Create an empty reference to an accessible object.
@@ -48,7 +48,7 @@ AccessibleShape*
         const AccessibleShapeTreeInfo& /*rShapeTreeInfo*/,
         ShapeTypeId /*nId*/)
 {
-    return NULL;
+    return nullptr;
 }
 
 
@@ -58,10 +58,10 @@ ShapeTypeHandler& ShapeTypeHandler::Instance()
 {
     // Using double check pattern to make sure that exactly one instance of
     // the shape type handler is instantiated.
-    if (instance == NULL)
+    if (instance == nullptr)
     {
         SolarMutexGuard aGuard;
-        if (instance == NULL)
+        if (instance == nullptr)
         {
             // Create the single instance of the shape type handler.
             instance = new ShapeTypeHandler;
@@ -154,7 +154,7 @@ ShapeTypeHandler::~ShapeTypeHandler()
     //  we reset the static variable instance, so that further calls to
     //  getInstance do not return an undefined object but create a new
     //  singleton.
-    instance = NULL;
+    instance = nullptr;
 }
 
 
diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx
index 308950f2997d..250159891a20 100644
--- a/svx/source/accessibility/SvxShapeTypes.cxx
+++ b/svx/source/accessibility/SvxShapeTypes.cxx
@@ -80,7 +80,7 @@ AccessibleShape* CreateSvxAccessibleShape (
             return new AccessibleTableShape( rShapeInfo, rShapeTreeInfo );
 
         default:
-            return NULL;
+            return nullptr;
     }
 }
 
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index d2bed5cb1581..9be840d2f054 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -44,7 +44,7 @@ namespace svx
 
 SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) : OAccessibleComponentHelper(new VCLExternalSolarLock())
 ,mpParent( pParent )
-,m_pTable(NULL)
+,m_pTable(nullptr)
 {
     osl_atomic_increment(&m_refCount);
     {
@@ -154,12 +154,12 @@ css::awt::Rectangle SvxShowCharSetVirtualAcc::implGetBounds(  ) throw (RuntimeEx
     vcl::Window* pWindow = mpParent;
     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 );
             css::awt::Point aParentScreenLoc = AWTPoint( aParentRect.TopLeft() );
             aBounds.X -= aParentScreenLoc.X;
             aBounds.Y -= aParentScreenLoc.Y;
@@ -221,7 +221,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::disposing()
     OAccessibleContextHelper::disposing();
     if ( m_pTable )
         m_pTable->dispose();
-    m_pTable = NULL;
+    m_pTable = nullptr;
 }
 
 
@@ -231,7 +231,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::disposing()
 SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc*  _pParent,sal_uInt16 _nPos ) :
     mrParent( rParent )
     ,mnId( _nPos )
-    ,m_pItem(NULL)
+    ,m_pItem(nullptr)
     ,m_pParent(_pParent)
 {
 }
@@ -265,8 +265,8 @@ void SvxShowCharSetItem::ClearAccessible()
 {
     if ( m_xAcc.is() )
     {
-        m_pItem = NULL;
-        m_xAcc  = NULL;
+        m_pItem = nullptr;
+        m_xAcc  = nullptr;
     }
 }
 
@@ -302,7 +302,7 @@ void SAL_CALL SvxShowCharSetAcc::disposing()
         ::comphelper::disposeComponent(*aIter);
 
     m_aChildren.clear();
-    m_pParent = NULL;
+    m_pParent = nullptr;
 }
 
 
@@ -632,7 +632,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetItemAcc, OAccessibleComponentHel
 void SvxShowCharSetItemAcc::ParentDestroyed()
 {
     const ::osl::MutexGuard aGuard( GetMutex() );
-    mpParent = NULL;
+    mpParent = nullptr;
 }
 
 
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index b5489af9f36e..62e9fd555ce6 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -259,7 +259,7 @@ awt::Point SvxPixelCtlAccessible::getLocation(  ) throw (uno::RuntimeException,
 awt::Point SvxPixelCtlAccessible::getLocationOnScreen(  ) throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
-    Rectangle rect = mrPixelCtl.GetWindowExtentsRelative(NULL);
+    Rectangle rect = mrPixelCtl.GetWindowExtentsRelative(nullptr);
     return awt::Point(rect.Left(),rect.Top() );
 }
 
@@ -433,7 +433,7 @@ void SvxPixelCtlAccessible::NotifyChild(long nIndex,bool bSelect ,bool bCheck)
 {
     DBG_ASSERT( !(!bSelect && !bCheck),"" );//non is false
 
-    SvxPixelCtlAccessibleChild *pChild= NULL;
+    SvxPixelCtlAccessibleChild *pChild= nullptr;
 
     if (m_xCurChild.is())
     {
@@ -597,8 +597,8 @@ awt::Rectangle SAL_CALL SvxPixelCtlAccessibleChild::getBounds() throw( RuntimeEx
     //Modified by lq, 09/26
     //return AWTRectangle( GetBoundingBox() );
     awt::Rectangle rect = AWTRectangle( GetBoundingBox() );
-    rect.X = rect.X + mrParentWindow.GetClientWindowExtentsRelative(NULL).Left()-mrParentWindow.GetWindowExtentsRelative(NULL).Left();
-    rect.Y = rect.Y + mrParentWindow.GetClientWindowExtentsRelative(NULL).Top()-mrParentWindow.GetWindowExtentsRelative(NULL).Top();
+    rect.X = rect.X + mrParentWindow.GetClientWindowExtentsRelative(nullptr).Left()-mrParentWindow.GetWindowExtentsRelative(nullptr).Left();
+    rect.Y = rect.Y + mrParentWindow.GetClientWindowExtentsRelative(nullptr).Top()-mrParentWindow.GetWindowExtentsRelative(nullptr).Top();
     return rect;
     // End
 }
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 79ca4715d12e..b25774e763c4 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -140,7 +140,7 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
     SvxRectCtlAccessibleContext_Base( m_aMutex ),
     mxParent( rxParent ),
     mpRepr( &rRepr ),
-    mpChildren( NULL ),
+    mpChildren( nullptr ),
     mnClientId( 0 ),
     mnSelectedChild( NOCHILDSELECTED ),
     mbAngleMode( rRepr.GetNumOfChildren() == 8 )
@@ -166,7 +166,7 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
 
     SvxRectCtlChildAccessibleContext**  p = mpChildren;
     for( int i = MAX_NUM_OF_CHILDREN ; i ; --i, ++p )
-        *p = NULL;
+        *p = nullptr;
 }
 
 
@@ -648,7 +648,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing()
     {
         {
             ::osl::MutexGuard   aGuard( m_aMutex );
-            mpRepr = NULL;      // object dies with representation
+            mpRepr = nullptr;      // object dies with representation
 
             SvxRectCtlChildAccessibleContext**  p = mpChildren;
             for( int i = MAX_NUM_OF_CHILDREN ; i ; --i, ++p )
@@ -658,12 +658,12 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing()
                 {
                     pChild->dispose();
                     pChild->release();
-                    *p = NULL;
+                    *p = nullptr;
                 }
             }
 
             delete[] mpChildren;
-            mpChildren = NULL;
+            mpChildren = nullptr;
         }
 
         {