loplugin:nullptr (automatic rewrite)

Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5

31 files changed, 120 insertions, 120 deletions

diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx
index e2afe89eeb14..012f0a0c3fc4 100644
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
@@ -30,7 +30,7 @@ namespace sdr
     {
         Event::Event(sal_uInt32 nTime)
         :   mnTime(nTime),
-            mpNext(0L)
+            mpNext(nullptr)
         {
         }
 
@@ -66,7 +66,7 @@ namespace sdr
     namespace animation
     {
         EventList::EventList()
-        :   mpHead(0L)
+        :   mpHead(nullptr)
         {
         }
 
@@ -80,7 +80,7 @@ namespace sdr
             if(pNew)
             {
                 Event* pCurrent = mpHead;
-                Event* pPrev = 0L;
+                Event* pPrev = nullptr;
 
                 while(pCurrent && pCurrent->GetTime() < pNew->GetTime())
                 {
@@ -106,7 +106,7 @@ namespace sdr
             if(pOld && mpHead)
             {
                 Event* pCurrent = mpHead;
-                Event* pPrev = 0L;
+                Event* pPrev = nullptr;
 
                 while(pCurrent && pCurrent != pOld)
                 {
@@ -123,7 +123,7 @@ namespace sdr
                     mpHead = pOld->GetNext();
                 }
 
-                pOld->SetNext(0L);
+                pOld->SetNext(nullptr);
             }
         }
 
@@ -132,7 +132,7 @@ namespace sdr
             while(mpHead)
             {
                 Event* pNext = mpHead->GetNext();
-                mpHead->SetNext(0L);
+                mpHead->SetNext(nullptr);
                 mpHead = pNext;
             }
         }
diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx
index 2ad56ce44172..983854c57492 100644
--- a/svx/source/sdr/attribute/sdrtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrtextattribute.cxx
@@ -132,7 +132,7 @@ namespace drawinglayer
             }
 
             ImpSdrTextAttribute()
-            :   mpSdrText(0),
+            :   mpSdrText(nullptr),
                 maSdrFormTextAttribute(),
                 maTextLeftDistance(0),
                 maTextUpperDistance(0),
diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx
index 9ae337ba3cb0..10b971b7329e 100644
--- a/svx/source/sdr/contact/objectcontact.cxx
+++ b/svx/source/sdr/contact/objectcontact.cxx
@@ -34,8 +34,8 @@ namespace sdr { namespace contact {
 ObjectContact::ObjectContact()
 :   maViewObjectContactVector(),
     maPrimitiveAnimator(),
-    mpEventHandler(0),
-    mpViewObjectContactRedirector(0),
+    mpEventHandler(nullptr),
+    mpViewObjectContactRedirector(nullptr),
     maViewInformation2D(uno::Sequence< beans::PropertyValue >()),
     mbIsPreviewRenderer(false)
 {
@@ -115,7 +115,7 @@ bool ObjectContact::DoVisualizeEnteredGroup() const
 const ViewContact* ObjectContact::getActiveViewContact() const
 {
     // default has no active VC
-    return 0;
+    return nullptr;
 }
 
 // Invalidate given rectangle at the window/output which is represented by
@@ -167,14 +167,14 @@ void ObjectContact::DeleteEventHandler()
     {
         // If there are still Events registered, something has went wrong
         delete mpEventHandler;
-        mpEventHandler = 0L;
+        mpEventHandler = nullptr;
     }
 }
 
 // test if there is an EventHandler without creating one on demand
 bool ObjectContact::HasEventHandler() const
 {
-    return (0L != mpEventHandler);
+    return (nullptr != mpEventHandler);
 }
 
 // check if text animation is allowed. Default is sal_true.
@@ -254,13 +254,13 @@ bool ObjectContact::isDrawModeHighContrast() const
 // access to SdrPageView. Default implementation returns NULL
 SdrPageView* ObjectContact::TryToGetSdrPageView() const
 {
-    return 0;
+    return nullptr;
 }
 
 // access to OutputDevice. Default implementation returns NULL
 OutputDevice* ObjectContact::TryToGetOutputDevice() const
 {
-    return 0;
+    return nullptr;
 }
 
 void ObjectContact::resetViewPort()
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index 6f62f8e670ca..69d74b0862ad 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -145,7 +145,7 @@ bool ObjectContactOfObjListPainter::isOutputToRecordingMetaFile() const
 // pdf export?
 bool ObjectContactOfObjListPainter::isOutputToPDFFile() const
 {
-    return (0 != mrTargetOutputDevice.GetPDFWriter());
+    return (nullptr != mrTargetOutputDevice.GetPDFWriter());
 }
 
 OutputDevice* ObjectContactOfObjListPainter::TryToGetOutputDevice() const
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 4786c7a5b8d1..b30c904bb5f1 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -164,7 +164,7 @@ namespace sdr
 
             // #114359# save old and set clip region
             OutputDevice* pOutDev = TryToGetOutputDevice();
-            OSL_ENSURE(0 != pOutDev, "ObjectContactOfPageView without OutDev, someone has overridden TryToGetOutputDevice wrong (!)");
+            OSL_ENSURE(nullptr != pOutDev, "ObjectContactOfPageView without OutDev, someone has overridden TryToGetOutputDevice wrong (!)");
             bool bClipRegionPushed(false);
             const vcl::Region& rRedrawArea(rDisplayInfo.GetRedrawArea());
 
@@ -347,7 +347,7 @@ namespace sdr
                 return &(GetSdrPage()->GetViewContact());
             }
 
-            return 0;
+            return nullptr;
         }
 
         // Invalidate given rectangle at the window/output which is represented by
@@ -446,7 +446,7 @@ namespace sdr
         // pdf export?
         bool ObjectContactOfPageView::isOutputToPDFFile() const
         {
-            return (0 != mrPageWindow.GetPaintWindow().GetOutputDevice().GetPDFWriter());
+            return (nullptr != mrPageWindow.GetPaintWindow().GetOutputDevice().GetPDFWriter());
         }
 
         // gray display mode
diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx
index e2aed54ec2ae..9e15adb3ad96 100644
--- a/svx/source/sdr/contact/viewcontact.cxx
+++ b/svx/source/sdr/contact/viewcontact.cxx
@@ -78,7 +78,7 @@ void ViewContact::deleteAllVOCs()
 // ObjectContact (->View). Always needs to return something.
 ViewObjectContact& ViewContact::GetViewObjectContact(ObjectContact& rObjectContact)
 {
-    ViewObjectContact* pRetval = 0L;
+    ViewObjectContact* pRetval = nullptr;
     const sal_uInt32 nCount(maViewObjectContactVector.size());
 
     // first search if there exists a VOC for the given OC
@@ -180,7 +180,7 @@ ViewContact& ViewContact::GetViewContact(sal_uInt32 /*nIndex*/) const
 ViewContact* ViewContact::GetParentContact() const
 {
     // default has no parent
-    return 0;
+    return nullptr;
 }
 
 void ViewContact::ActionChildInserted(ViewContact& rChild)
@@ -220,7 +220,7 @@ void ViewContact::ActionChanged()
 // implementations do. Override as needed.
 SdrObject* ViewContact::TryToGetSdrObject() const
 {
-    return 0L;
+    return nullptr;
 }
 
 // primitive stuff
diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx
index e5d9f689e5df..a07a7ec1cf4c 100644
--- a/svx/source/sdr/contact/viewcontactofe3d.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3d.cxx
@@ -60,7 +60,7 @@ const sdr::contact::ViewContactOfE3dScene* tryToFindVCOfE3DScene(
     }
 
     // object hierarchy structure is incorrect; no result
-    return 0;
+    return nullptr;
 }
 
 } // end of anonymous namespace
diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
index 7c32e153b4c3..383d09fd788c 100644
--- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
@@ -64,7 +64,7 @@ void createSubPrimitive3DVector(
                 createSubPrimitive3DVector(
                     rCandidate.GetViewContact(a),
                     aNewAllTarget,
-                    o_pVisibleTarget ? &aNewVisibleTarget : 0,
+                    o_pVisibleTarget ? &aNewVisibleTarget : nullptr,
                     pVisibleLayerSet,
                     bTestSelectedVisibility);
             }
@@ -279,7 +279,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3dScene::createScen
         // create 3d scene primitive with visible content tested against rLayerVisibility
         drawinglayer::primitive3d::Primitive3DSequence aAllSequence;
         drawinglayer::primitive3d::Primitive3DSequence aVisibleSequence;
-        const bool bTestLayerVisibility(0 != pLayerVisibility);
+        const bool bTestLayerVisibility(nullptr != pLayerVisibility);
         const bool bTestSelectedVisibility(GetE3dScene().GetDrawOnlySelected());
         const bool bTestVisibility(bTestLayerVisibility || bTestSelectedVisibility);
 
@@ -292,8 +292,8 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3dScene::createScen
             createSubPrimitive3DVector(
                 GetViewContact(a),
                 aAllSequence,
-                bTestLayerVisibility ? &aVisibleSequence : 0,
-                bTestLayerVisibility ? pLayerVisibility : 0,
+                bTestLayerVisibility ? &aVisibleSequence : nullptr,
+                bTestLayerVisibility ? pLayerVisibility : nullptr,
                 bTestSelectedVisibility);
         }
 
@@ -340,7 +340,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3dScene::createView
     if(GetObjectCount())
     {
         // create a default ScenePrimitive2D (without visibility test of members)
-        xRetval = createScenePrimitive2DSequence(0);
+        xRetval = createScenePrimitive2DSequence(nullptr);
     }
 
     return xRetval;
@@ -433,7 +433,7 @@ drawinglayer::primitive3d::Primitive3DSequence ViewContactOfE3dScene::getAllPrim
     // is seen as part of the ViewTransformation (see text in createViewInformation3D)
     for(sal_uInt32 a(0L); a < nChildrenCount; a++)
     {
-        createSubPrimitive3DVector(GetViewContact(a), aAllPrimitive3DSequence, 0, 0, false);
+        createSubPrimitive3DVector(GetViewContact(a), aAllPrimitive3DSequence, nullptr, nullptr, false);
     }
 
     return aAllPrimitive3DSequence;
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 6ff5375ae927..1efd086f6f75 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -85,7 +85,7 @@ ViewContact& ViewContactOfSdrObj::GetViewContact(sal_uInt32 nIndex) const
 
 ViewContact* ViewContactOfSdrObj::GetParentContact() const
 {
-    ViewContact* pRetval = 0L;
+    ViewContact* pRetval = nullptr;
     SdrObjList* pObjList = GetSdrObject().GetObjList();
 
     if(pObjList)
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 4f68e3bd29d8..fa92aed98b06 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -88,7 +88,7 @@ namespace sdr { namespace contact {
         SdrUnoObj* pUnoObject = dynamic_cast< SdrUnoObj* >( TryToGetSdrObject() );
         OSL_ENSURE( pUnoObject, "ViewContactOfUnoControl::getTemporaryControlForDevice: no SdrUnoObj!" );
         if ( !pUnoObject )
-            return NULL;
+            return nullptr;
         return ViewObjectContactOfUnoControl::getTemporaryControlForWindow( _rWindow, _inout_ControlContainer, *pUnoObject );
     }
 
@@ -100,7 +100,7 @@ namespace sdr { namespace contact {
         ObjectContactOfPageView* const pPageViewContact = dynamic_cast< ObjectContactOfPageView* >( &_rObjectContact  );
 
         const bool bPrintOrPreview = pPageViewContact
-            && ( ( ( pDevice != NULL ) && ( pDevice->GetOutDevType() == OUTDEV_PRINTER ) )
+            && ( ( ( pDevice != nullptr ) && ( pDevice->GetOutDevType() == OUTDEV_PRINTER ) )
                     || pPageViewContact->GetPageWindow().GetPageView().GetView().IsPrintPreview()
                )
             ;
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index 7ce2905c4809..8078349251fb 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -165,7 +165,7 @@ ViewObjectContact::ViewObjectContact(ObjectContact& rObjectContact, ViewContact&
     mrViewContact(rViewContact),
     maObjectRange(),
     mxPrimitive2DSequence(),
-    mpPrimitiveAnimation(0),
+    mpPrimitiveAnimation(nullptr),
     mbLazyInvalidate(false)
 {
     // make the ViewContact remember me
@@ -187,7 +187,7 @@ ViewObjectContact::~ViewObjectContact()
     if(mpPrimitiveAnimation)
     {
         delete mpPrimitiveAnimation;
-        mpPrimitiveAnimation = 0;
+        mpPrimitiveAnimation = nullptr;
     }
 
     // take care of remembered ObjectContact. Remove from
@@ -297,7 +297,7 @@ void ViewObjectContact::checkForPrimitive2DAnimations()
     if(mpPrimitiveAnimation)
     {
         delete mpPrimitiveAnimation;
-        mpPrimitiveAnimation = 0;
+        mpPrimitiveAnimation = nullptr;
     }
 
     // check for animated primitives
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index a2a578e029b4..dd68629779e6 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -218,7 +218,7 @@ namespace sdr
             // #i103720# forget event to avoid possible deletion by the following ActionChanged call
             // which may use createPrimitive2DSequence/impPrepareGraphicWithAsynchroniousLoading again.
             // Deletion is actually done by the scheduler who leaded to coming here
-            mpAsynchLoadEvent = 0;
+            mpAsynchLoadEvent = nullptr;
 
             // Invalidate all paint areas and check existing animation (which may have changed).
             GetViewContact().ActionChanged();
@@ -237,7 +237,7 @@ namespace sdr
                     "ViewObjectContactOfGraphic::forgetAsynchGraphicLoadingEvent: Forced to forget another event then I have scheduled (?)");
 
                 // forget event
-                mpAsynchLoadEvent = 0;
+                mpAsynchLoadEvent = nullptr;
             }
         }
 
@@ -307,7 +307,7 @@ namespace sdr
 
         ViewObjectContactOfGraphic::ViewObjectContactOfGraphic(ObjectContact& rObjectContact, ViewContact& rViewContact)
         :   ViewObjectContactOfSdrObj(rObjectContact, rViewContact),
-            mpAsynchLoadEvent(0)
+            mpAsynchLoadEvent(nullptr)
         {
         }
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index 7cc66dcfc4ab..8a1b3ccbb4a4 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -77,7 +77,7 @@ public:
 
 PagePrimitiveExtractor::PagePrimitiveExtractor(
     ViewObjectContactOfPageObj& rVOC)
-:   ObjectContactOfPagePainter(0, rVOC.GetObjectContact()),
+:   ObjectContactOfPagePainter(nullptr, rVOC.GetObjectContact()),
     mrViewObjectContactOfPageObj(rVOC)
 {
     // make this renderer a preview renderer
@@ -258,7 +258,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageObj::creat
 
             // #i105548# reset VOCRedirector to not accidentally have a pointer to a
             // temporary class, so calls to it are avoided safely
-            mpExtractor->SetViewObjectContactRedirector(0);
+            mpExtractor->SetViewObjectContactRedirector(nullptr);
 
             // reset recursion flag
             bInCreatePrimitive2D = false;
@@ -314,11 +314,11 @@ ViewObjectContactOfPageObj::~ViewObjectContactOfPageObj()
         // remember candidate and reset own pointer to avoid action when createPrimitive2DSequence()
         // would be called for any reason
         PagePrimitiveExtractor* pCandidate = mpExtractor;
-        mpExtractor = 0;
+        mpExtractor = nullptr;
 
         // also reset the StartPage to avoid ActionChanged() forwardings in the
         // PagePrimitiveExtractor::InvalidatePartOfView() implementation
-        pCandidate->SetStartPage(0);
+        pCandidate->SetStartPage(nullptr);
         delete pCandidate;
     }
 }
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index a114927f360d..cdc5cc2a4112 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -36,7 +36,7 @@ ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r
                                                                 ViewContact& rViewContact,
                                                                 const ::avmedia::MediaItem& rMediaItem ) :
     ViewObjectContactOfSdrObj( rObjectContact, rViewContact ),
-    mpMediaWindow( NULL )
+    mpMediaWindow( nullptr )
 {
 #if HAVE_FEATURE_AVMEDIA
     vcl::Window* pWindow = getWindow();
@@ -55,14 +55,14 @@ ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r
 ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj()
 {
     delete mpMediaWindow;
-    mpMediaWindow = NULL;
+    mpMediaWindow = nullptr;
 }
 
 
 
 vcl::Window* ViewObjectContactOfSdrMediaObj::getWindow() const
 {
-    vcl::Window* pRetval = 0;
+    vcl::Window* pRetval = nullptr;
 
     boost::optional<const OutputDevice&> oPageOutputDev = getPageViewOutputDevice();
     if( oPageOutputDev )
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
index 0c9afc62db49..836925c0f5e0 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
@@ -125,7 +125,7 @@ bool ViewObjectContactOfSdrObj::isPrimitiveVisible(const DisplayInfo& rDisplayIn
             }
             else
             {
-                const bool bIsFormControl = dynamic_cast< const FmFormObj * >( &rObject ) != 0;
+                const bool bIsFormControl = dynamic_cast< const FmFormObj * >( &rObject ) != nullptr;
                 if(bIsFormControl && bHideFormControl)
                 {
                     return false;
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 169b136f28bf..d3a46cb5feec 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -391,7 +391,7 @@ namespace sdr { namespace contact {
     Reference< XControlContainer > SdrPageViewAccess::getControlContainer( const OutputDevice& _rDevice ) const
     {
         Reference< XControlContainer > xControlContainer = m_rPageView.GetControlContainer( _rDevice );
-        DBG_ASSERT( xControlContainer.is() || NULL == m_rPageView.FindPageWindow( _rDevice ),
+        DBG_ASSERT( xControlContainer.is() || nullptr == m_rPageView.FindPageWindow( _rDevice ),
             "SdrPageViewAccess::getControlContainer: the output device is known, but there is no control container for it?" );
         return xControlContainer;
     }
@@ -482,7 +482,7 @@ namespace sdr { namespace contact {
 
     Reference< XControlContainer > DummyPageViewAccess::getControlContainer( const OutputDevice& /*_rDevice*/ ) const
     {
-        return NULL;
+        return nullptr;
     }
 
 
@@ -757,7 +757,7 @@ namespace sdr { namespace contact {
         /** determines whether the instance is disposed
             @nofail
         */
-        bool    impl_isDisposed_nofail() const { return m_pAntiImpl == NULL; }
+        bool    impl_isDisposed_nofail() const { return m_pAntiImpl == nullptr; }
 
         /** determines whether our control is currently visible
             @nofail
@@ -848,7 +848,7 @@ namespace sdr { namespace contact {
     ViewObjectContactOfUnoControl_Impl::ViewObjectContactOfUnoControl_Impl( ViewObjectContactOfUnoControl* _pAntiImpl )
         :m_pAntiImpl( _pAntiImpl )
         ,m_bCreatingControl( false )
-        ,m_pOutputDeviceForWindow( NULL )
+        ,m_pOutputDeviceForWindow( nullptr )
         ,m_bControlIsVisible( false )
         ,m_bIsDesignModeListening( false )
         ,m_eControlDesignMode( eUnknown )
@@ -905,10 +905,10 @@ namespace sdr { namespace contact {
 
         m_aControl.clear();
         m_xContainer.clear();
-        m_pOutputDeviceForWindow = NULL;
+        m_pOutputDeviceForWindow = nullptr;
         m_bControlIsVisible = false;
 
-        m_pAntiImpl = NULL;
+        m_pAntiImpl = nullptr;
     }
 
 
@@ -923,14 +923,14 @@ namespace sdr { namespace contact {
     {
         OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::getUnoObject: already disposed()" );
         if ( impl_isDisposed_nofail() )
-            _out_rpObject = NULL;
+            _out_rpObject = nullptr;
         else
         {
             _out_rpObject = dynamic_cast< SdrUnoObj* >( m_pAntiImpl->GetViewContact().TryToGetSdrObject() );
             DBG_ASSERT( _out_rpObject || !m_pAntiImpl->GetViewContact().TryToGetSdrObject(),
                 "ViewObjectContactOfUnoControl_Impl::getUnoObject: invalid SdrObject!" );
         }
-        return ( _out_rpObject != NULL );
+        return ( _out_rpObject != nullptr );
     }
 
 
@@ -942,7 +942,7 @@ namespace sdr { namespace contact {
 
         try
         {
-            SdrUnoObj* pUnoObject( NULL );
+            SdrUnoObj* pUnoObject( nullptr );
             if ( getUnoObject( pUnoObject ) )
             {
                 Point aGridOffset = pUnoObject->GetGridOffset();
@@ -1054,7 +1054,7 @@ namespace sdr { namespace contact {
             UnoControlContactHelper::disposeAndClearControl_nothrow( m_aControl );
         }
 
-        SdrUnoObj* pUnoObject( NULL );
+        SdrUnoObj* pUnoObject( nullptr );
         if ( !getUnoObject( pUnoObject ) )
             return false;
 
@@ -1067,7 +1067,7 @@ namespace sdr { namespace contact {
         m_xContainer.set(_rPageView.getControlContainer( _rDevice ), css::uno::UNO_QUERY);
         DBG_ASSERT( (   m_xContainer.is()                                           // either have a XControlContainer
                     ||  (   ( !_rPageView.getControlContainer( _rDevice ).is() )    // or don't have any container,
-                        &&  ( dynamic_cast< const vcl::Window* >( &_rDevice ) == NULL )  // which is allowed for non-Window instances only
+                        &&  ( dynamic_cast< const vcl::Window* >( &_rDevice ) == nullptr )  // which is allowed for non-Window instances only
                         )
                     ),
             "ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow: no XContainer at the ControlContainer!" );
@@ -1163,7 +1163,7 @@ namespace sdr { namespace contact {
     {
         OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::impl_getPageView_nothrow: already disposed!" );
 
-        _out_rpPageView = NULL;
+        _out_rpPageView = nullptr;
         if ( impl_isDisposed_nofail() )
             return false;
 
@@ -1171,8 +1171,8 @@ namespace sdr { namespace contact {
         if ( pPageViewContact )
             _out_rpPageView = &pPageViewContact->GetPageWindow().GetPageView();
 
-        DBG_ASSERT( _out_rpPageView != NULL, "ViewObjectContactOfUnoControl_Impl::impl_getPageView_nothrow: this method is expected to always have success!" );
-        return ( _out_rpPageView != NULL );
+        DBG_ASSERT( _out_rpPageView != nullptr, "ViewObjectContactOfUnoControl_Impl::impl_getPageView_nothrow: this method is expected to always have success!" );
+        return ( _out_rpPageView != nullptr );
     }
 
 
@@ -1181,11 +1181,11 @@ namespace sdr { namespace contact {
         OSL_PRECOND( m_aControl.is(),
             "ViewObjectContactOfUnoControl_Impl::impl_adjustControlVisibilityToLayerVisibility_throw: only valid if we have a control!" );
 
-        SdrPageView* pPageView( NULL );
+        SdrPageView* pPageView( nullptr );
         if ( !impl_getPageView_nothrow( pPageView ) )
             return;
 
-        SdrUnoObj* pUnoObject( NULL );
+        SdrUnoObj* pUnoObject( nullptr );
         if ( !getUnoObject( pUnoObject ) )
             return;
 
@@ -1299,7 +1299,7 @@ namespace sdr { namespace contact {
 
     bool ViewObjectContactOfUnoControl_Impl::isPrintableControl() const
     {
-        SdrUnoObj* pUnoObject( NULL );
+        SdrUnoObj* pUnoObject( nullptr );
         if ( !getUnoObject( pUnoObject ) )
             return false;
 
@@ -1613,7 +1613,7 @@ namespace sdr { namespace contact {
     ViewObjectContactOfUnoControl::~ViewObjectContactOfUnoControl()
     {
         m_pImpl->dispose();
-        m_pImpl = NULL;
+        m_pImpl = nullptr;
 
     }
 
@@ -1621,7 +1621,7 @@ namespace sdr { namespace contact {
     Reference< XControl > ViewObjectContactOfUnoControl::getControl()
     {
         SolarMutexGuard aSolarGuard;
-        m_pImpl->ensureControl( NULL );
+        m_pImpl->ensureControl( nullptr );
         return m_pImpl->getExistentControl().getControl();
     }
 
diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx
index c8c4f7a1ae99..50625289caff 100644
--- a/svx/source/sdr/event/eventhandler.cxx
+++ b/svx/source/sdr/event/eventhandler.cxx
@@ -78,7 +78,7 @@ namespace sdr
             }
             else
             {
-                return 0L;
+                return nullptr;
             }
         }
 
@@ -100,7 +100,7 @@ namespace sdr
             for(;;)
             {
                 BaseEvent* pEvent = GetEvent();
-                if(pEvent == NULL)
+                if(pEvent == nullptr)
                     break;
                 pEvent->ExecuteEvent();
                 delete pEvent;
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index d32e4d679789..27faabd67acb 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -194,7 +194,7 @@ namespace sdr
             invalidateRange(rTarget.getBaseRange());
 
             // clear manager
-            rTarget.mpOverlayManager = 0;
+            rTarget.mpOverlayManager = nullptr;
         }
 
         void OverlayManager::impApplyAddActions(OverlayObject& rTarget)
@@ -268,7 +268,7 @@ namespace sdr
 
         void OverlayManager::add(OverlayObject& rOverlayObject)
         {
-            OSL_ENSURE(0 == rOverlayObject.mpOverlayManager, "OverlayObject is added twice to an OverlayManager (!)");
+            OSL_ENSURE(nullptr == rOverlayObject.mpOverlayManager, "OverlayObject is added twice to an OverlayManager (!)");
 
             // add to the end of chain to preserve display order in paint
             maOverlayObjects.push_back(&rOverlayObject);
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 25109df16e89..cba94c6f9091 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -425,7 +425,7 @@ namespace sdr
         void OverlayManagerBuffered::flush()
         {
             // call timer handler direct
-            ImpBufferTimerHandler(0);
+            ImpBufferTimerHandler(nullptr);
         }
 
         void OverlayManagerBuffered::restoreBackground(const vcl::Region& rRegion) const
diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx
index 00499829e0fb..09d1d948687f 100644
--- a/svx/source/sdr/overlay/overlayobject.cxx
+++ b/svx/source/sdr/overlay/overlayobject.cxx
@@ -91,7 +91,7 @@ namespace sdr
 
         OverlayObject::OverlayObject(Color aBaseColor)
         :   Event(0),
-            mpOverlayManager(0),
+            mpOverlayManager(nullptr),
             maBaseColor(aBaseColor),
             mbIsVisible(true),
             mbIsHittable(true),
@@ -102,7 +102,7 @@ namespace sdr
 
         OverlayObject::~OverlayObject()
         {
-            OSL_ENSURE(0 == getOverlayManager(), "OverlayObject is destructed which is still registered at OverlayManager (!)");
+            OSL_ENSURE(nullptr == getOverlayManager(), "OverlayObject is destructed which is still registered at OverlayManager (!)");
         }
 
         drawinglayer::primitive2d::Primitive2DSequence OverlayObject::getOverlayObjectPrimitive2DSequence() const
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index 390683f2be3b..7d41b77eb2ed 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -83,7 +83,7 @@ namespace drawinglayer
             }
 
             // prepare fully scaled polygon
-            BasePrimitive2D* pNewFillPrimitive = 0;
+            BasePrimitive2D* pNewFillPrimitive = nullptr;
 
             if(!rFill.getGradient().isDefault())
             {
@@ -155,7 +155,7 @@ namespace drawinglayer
             // create line and stroke attribute
             const attribute::LineAttribute aLineAttribute(rLine.getColor(), rLine.getWidth(), rLine.getJoin(), rLine.getCap());
             const attribute::StrokeAttribute aStrokeAttribute(rLine.getDotDashArray(), rLine.getFullDotDashLen());
-            BasePrimitive2D* pNewLinePrimitive = 0L;
+            BasePrimitive2D* pNewLinePrimitive = nullptr;
 
             if(!rPolygon.isClosed() && !rStroke.isDefault())
             {
@@ -195,7 +195,7 @@ namespace drawinglayer
             bool bClipOnBounds)
         {
             basegfx::B2DHomMatrix aAnchorTransform(rObjectTransform);
-            SdrTextPrimitive2D* pNew = 0;
+            SdrTextPrimitive2D* pNew = nullptr;
 
             if(rText.isContour())
             {
@@ -337,7 +337,7 @@ namespace drawinglayer
                 }
             }
 
-            OSL_ENSURE(pNew != 0, "createTextPrimitive: no text primitive created (!)");
+            OSL_ENSURE(pNew != nullptr, "createTextPrimitive: no text primitive created (!)");
 
             if(rText.isBlink())
             {
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index ea4ffa396d30..0594716fd427 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -37,7 +37,7 @@ namespace drawinglayer
         Primitive2DSequence SdrOleContentPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const
         {
             Primitive2DSequence aRetval;
-            const SdrOle2Obj* pSource = (mpSdrOle2Obj.is() ? static_cast< SdrOle2Obj* >(mpSdrOle2Obj.get()) : 0);
+            const SdrOle2Obj* pSource = (mpSdrOle2Obj.is() ? static_cast< SdrOle2Obj* >(mpSdrOle2Obj.get()) : nullptr);
             bool bScaleContent(false);
             Graphic aGraphic;
 
diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
index 21cf0812545c..78a27d92fc92 100644
--- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
+++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
@@ -31,7 +31,7 @@ namespace drawinglayer
     {
         BitmapEx createDefaultCross_3x3(const basegfx::BColor& rBColor)
         {
-            static vcl::DeleteOnDeinit< BitmapEx > aRetVal(0);
+            static vcl::DeleteOnDeinit< BitmapEx > aRetVal(nullptr);
             static basegfx::BColor aColor;
             static ::osl::Mutex aMutex;
 
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 0fbcd16ed873..674b3ef4a5f4 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -99,7 +99,7 @@ namespace sdr
                 // reset parent of ItemSet
                 if(mpItemSet)
                 {
-                    mpItemSet->SetParent(0L);
+                    mpItemSet->SetParent(nullptr);
                 }
 
                 SdrObject& rObj = GetSdrObject();
@@ -107,7 +107,7 @@ namespace sdr
                 rObj.SetRectsDirty(true);
             }
 
-            mpStyleSheet = 0L;
+            mpStyleSheet = nullptr;
         }
 
         // create a new itemset
@@ -126,13 +126,13 @@ namespace sdr
 
         AttributeProperties::AttributeProperties(SdrObject& rObj)
         :   DefaultProperties(rObj),
-            mpStyleSheet(0L)
+            mpStyleSheet(nullptr)
         {
         }
 
         AttributeProperties::AttributeProperties(const AttributeProperties& rProps, SdrObject& rObj)
         :   DefaultProperties(rProps, rObj),
-            mpStyleSheet(0L)
+            mpStyleSheet(nullptr)
         {
             if(rProps.GetStyleSheet())
             {
@@ -164,7 +164,7 @@ namespace sdr
         {
             if(pNewItem)
             {
-                const SfxPoolItem* pResultItem = NULL;
+                const SfxPoolItem* pResultItem = nullptr;
                 SdrModel* pModel = GetSdrObject().GetModel();
 
                 switch( nWhich )
@@ -246,7 +246,7 @@ namespace sdr
 
         void AttributeProperties::MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel)
         {
-            OSL_ASSERT(pNewModel!=NULL);
+            OSL_ASSERT(pNewModel!=nullptr);
 
             if(pSrcPool && pDestPool && (pSrcPool != pDestPool))
             {
@@ -285,12 +285,12 @@ namespace sdr
                             // name or use the default.
 
                             // Look up the style in the new document.
-                            OSL_ASSERT(pNewModel->GetStyleSheetPool() != NULL);
+                            OSL_ASSERT(pNewModel->GetStyleSheetPool() != nullptr);
                             SfxStyleSheet* pNewStyleSheet = dynamic_cast<SfxStyleSheet*>(
                                 pNewModel->GetStyleSheetPool()->Find(
                                     pStySheet->GetName(),
                                     SFX_STYLE_FAMILY_ALL));
-                            if (pNewStyleSheet == NULL
+                            if (pNewStyleSheet == nullptr
                                 || &pNewStyleSheet->GetPool().GetPool() != pDestPool)
                             {
                                 // There is no copy of the style in the new
@@ -340,7 +340,7 @@ namespace sdr
                         {
                             // build a list of to-be-copied Styles
                             std::vector<SfxStyleSheetBase*> aStyleList;
-                            SfxStyleSheetBase* pAnchor = 0L;
+                            SfxStyleSheetBase* pAnchor = nullptr;
 
                             while(pSheet)
                             {
@@ -354,14 +354,14 @@ namespace sdr
                                 else
                                 {
                                     // the style does exist
-                                    pSheet = 0L;
+                                    pSheet = nullptr;
                                 }
                             }
 
                             // copy and set the parents
-                            SfxStyleSheetBase* pNewSheet = 0L;
-                            SfxStyleSheetBase* pLastSheet = 0L;
-                            SfxStyleSheetBase* pForThisObject = 0L;
+                            SfxStyleSheetBase* pNewSheet = nullptr;
+                            SfxStyleSheetBase* pLastSheet = nullptr;
+                            SfxStyleSheetBase* pForThisObject = nullptr;
 
                             std::vector<SfxStyleSheetBase*>::iterator iter;
                             for (iter = aStyleList.begin(); iter != aStyleList.end(); ++iter)
@@ -456,7 +456,7 @@ namespace sdr
                                 }
 
                                 delete mpItemSet;
-                                mpItemSet = 0L;
+                                mpItemSet = nullptr;
                             }
 
                             mpItemSet = pNewSet;
@@ -480,7 +480,7 @@ namespace sdr
                 // prepare copied, new itemset, but WITHOUT parent
                 GetObjectItemSet();
                 SfxItemSet* pDestItemSet = new SfxItemSet(*mpItemSet);
-                pDestItemSet->SetParent(0L);
+                pDestItemSet->SetParent(nullptr);
 
                 // prepare forgetting the current stylesheet like in RemoveStyleSheet()
                 EndListening(*mpStyleSheet);
@@ -490,7 +490,7 @@ namespace sdr
                 // WhichIDs than the style.
                 SfxWhichIter aIter(*pDestItemSet);
                 sal_uInt16 nWhich(aIter.FirstWhich());
-                const SfxPoolItem *pItem = NULL;
+                const SfxPoolItem *pItem = nullptr;
 
                 // now set all hard attributes of the current at the new itemset
                 while(nWhich)
@@ -513,7 +513,7 @@ namespace sdr
                 GetSdrObject().SetBoundRectDirty();
                 GetSdrObject().SetRectsDirty(true);
 
-                mpStyleSheet = NULL;
+                mpStyleSheet = nullptr;
             }
         }
 
@@ -545,7 +545,7 @@ namespace sdr
                     case SfxStyleSheetHintId::INDESTRUCTION   :
                     {
                         // Style needs to be exchanged
-                        SfxStyleSheet* pNewStSh = 0L;
+                        SfxStyleSheet* pNewStSh = nullptr;
                         SdrModel* pModel = rObj.GetModel();
 
                         // Do nothing if object is in destruction, else a StyleSheet may be found from
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 813e963ea034..338cfedf1ec3 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -43,13 +43,13 @@ namespace sdr
 
         DefaultProperties::DefaultProperties(SdrObject& rObj)
         :   BaseProperties(rObj),
-            mpItemSet(0L)
+            mpItemSet(nullptr)
         {
         }
 
         DefaultProperties::DefaultProperties(const DefaultProperties& rProps, SdrObject& rObj)
         :   BaseProperties(rObj),
-            mpItemSet(0L)
+            mpItemSet(nullptr)
         {
             if(rProps.mpItemSet)
             {
@@ -59,7 +59,7 @@ namespace sdr
                 // This class just copies the ItemSet, ignore parent.
                 if(mpItemSet && mpItemSet->GetParent())
                 {
-                    mpItemSet->SetParent(0L);
+                    mpItemSet->SetParent(nullptr);
                 }
             }
         }
@@ -74,7 +74,7 @@ namespace sdr
             if(mpItemSet)
             {
                 delete mpItemSet;
-                mpItemSet = 0L;
+                mpItemSet = nullptr;
             }
         }
 
@@ -193,7 +193,7 @@ namespace sdr
 
         void DefaultProperties::PostItemChange(const sal_uInt16 nWhich )
         {
-            if( (nWhich == XATTR_FILLSTYLE) && (mpItemSet != NULL) )
+            if( (nWhich == XATTR_FILLSTYLE) && (mpItemSet != nullptr) )
                 CleanupFillProperties(*mpItemSet);
         }
 
@@ -205,7 +205,7 @@ namespace sdr
         SfxStyleSheet* DefaultProperties::GetStyleSheet() const
         {
             // no StyleSheet in DefaultProperties
-            return 0L;
+            return nullptr;
         }
 
         void DefaultProperties::ForceDefaultAttributes()
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index f9a128d4a5fe..44530ee1ba8f 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -247,7 +247,7 @@ namespace sdr
 
         SfxStyleSheet* E3dSceneProperties::GetStyleSheet() const
         {
-            SfxStyleSheet* pRetval = 0L;
+            SfxStyleSheet* pRetval = nullptr;
 
             const SdrObjList* pSub = static_cast<const E3dScene&>(GetSdrObject()).GetSubList();
             const size_t nCount(pSub->GetObjCount());
@@ -261,7 +261,7 @@ namespace sdr
                     if(pCandidate != pRetval)
                     {
                         // different StyleSheelts, return none
-                        return 0L;
+                        return nullptr;
                     }
                 }
                 else
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index f0567e8b9f97..d91644547b47 100644
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
@@ -40,13 +40,13 @@ namespace sdr
 
         EmptyProperties::EmptyProperties(SdrObject& rObj)
         :   BaseProperties(rObj),
-            mpEmptyItemSet(0L)
+            mpEmptyItemSet(nullptr)
         {
         }
 
         EmptyProperties::EmptyProperties(const EmptyProperties& rProps, SdrObject& rObj)
         :   BaseProperties(rProps, rObj),
-            mpEmptyItemSet(0L)
+            mpEmptyItemSet(nullptr)
         {
             // do not gererate an assert, else derivations like PageProperties will generate an assert
             // using the Clone() operator path.
@@ -57,7 +57,7 @@ namespace sdr
             if(mpEmptyItemSet)
             {
                 delete mpEmptyItemSet;
-                mpEmptyItemSet = 0L;
+                mpEmptyItemSet = nullptr;
             }
         }
 
@@ -133,7 +133,7 @@ namespace sdr
         SfxStyleSheet* EmptyProperties::GetStyleSheet() const
         {
             DBG_ASSERT(false, "EmptyProperties::GetStyleSheet() should never be called (!)");
-            return 0L;
+            return nullptr;
         }
     } // end of namespace properties
 } // end of namespace sdr
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index c4e9d91a17b8..f902c05aef6f 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -202,7 +202,7 @@ namespace sdr
 
         SfxStyleSheet* GroupProperties::GetStyleSheet() const
         {
-            SfxStyleSheet* pRetval = 0L;
+            SfxStyleSheet* pRetval = nullptr;
 
             const SdrObjList* pSub = static_cast<const SdrObjGroup&>(GetSdrObject()).GetSubList();
             const size_t nCount(pSub->GetObjCount());
@@ -216,7 +216,7 @@ namespace sdr
                     if(pCandidate != pRetval)
                     {
                         // different StyleSheelts, return none
-                        return 0L;
+                        return nullptr;
                     }
                 }
                 else
@@ -265,7 +265,7 @@ namespace sdr
                     // just delete it and set to 0L.
                     // mpItemSet->ClearItem();
                     delete mpItemSet;
-                    mpItemSet = 0L;
+                    mpItemSet = nullptr;
                 }
             }
         }
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index e97c4479af68..6a34946099f2 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -107,7 +107,7 @@ namespace sdr
 
             SfxWhichIter aIter(rSet);
             sal_uInt16 nWhich(aIter.FirstWhich());
-            const SfxPoolItem *pItem = NULL;
+            const SfxPoolItem *pItem = nullptr;
 
             while(nWhich)
             {
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index 36a93c7cfd2f..20758b0f24ed 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -76,12 +76,12 @@ namespace sdr
         SfxStyleSheet* PageProperties::GetStyleSheet() const
         {
             // override to legally return a 0L pointer here
-            return 0L;
+            return nullptr;
         }
 
         void PageProperties::PostItemChange(const sal_uInt16 nWhich )
         {
-            if( (nWhich == XATTR_FILLSTYLE) && (mpEmptyItemSet != NULL) )
+            if( (nWhich == XATTR_FILLSTYLE) && (mpEmptyItemSet != nullptr) )
                 CleanupFillProperties(*mpEmptyItemSet);
         }
 
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 8f68d861da24..9b4a045bb62a 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -92,7 +92,7 @@ namespace sdr
             {
                 SdrText* pText = rTextProvider.getText( nText );
 
-                OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : 0;
+                OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : nullptr;
 
                 if(pParaObj)
                 {
@@ -251,7 +251,7 @@ namespace sdr
                 {
                     SdrText* pText = rTextProvider.getText( nText );
 
-                    OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : 0;
+                    OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : nullptr;
                     if( !pParaObj )
                         continue;
 
@@ -263,7 +263,7 @@ namespace sdr
                     {
                         for(sal_Int32 nPara = 0; nPara < nParaCount; nPara++)
                         {
-                            SfxItemSet* pTempSet = 0L;
+                            SfxItemSet* pTempSet = nullptr;
 
                             // since setting the stylesheet removes all para attributes
                             if(bDontRemoveHardAttr)
@@ -282,8 +282,8 @@ namespace sdr
                                     aNewStyleSheetName += OUString::number( nDepth <= 0 ? 1 : nDepth + 1);
 
                                     SdrModel* pModel = rObj.GetModel();
-                                    SfxStyleSheetBasePool* pStylePool = (pModel != NULL) ? pModel->GetStyleSheetPool() : 0L;
-                                    SfxStyleSheet* pNewStyle = NULL;
+                                    SfxStyleSheetBasePool* pStylePool = (pModel != nullptr) ? pModel->GetStyleSheetPool() : nullptr;
+                                    SfxStyleSheet* pNewStyle = nullptr;
                                     if(pStylePool)
                                         pNewStyle = static_cast<SfxStyleSheet*>(pStylePool->Find(aNewStyleSheetName, GetStyleSheet()->GetFamily()));
                                     DBG_ASSERT( pNewStyle, "AutoStyleSheetName - Style not found!" );
@@ -301,7 +301,7 @@ namespace sdr
                             else
                             {
                                 // remove StyleSheet
-                                rOutliner.SetStyleSheet(nPara, 0L);
+                                rOutliner.SetStyleSheet(nPara, nullptr);
                             }
 
                             if(bDontRemoveHardAttr)
@@ -413,7 +413,7 @@ namespace sdr
                 {
                     SdrText* pText = rTextProvider.getText( nText );
 
-                    OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : 0;
+                    OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : nullptr;
                     if( !pParaObj )
                         continue;