1 files changed, 25 insertions, 25 deletions

diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index d22ed7d48b42..10c780b61bfe 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -72,11 +72,11 @@ namespace {
     */
     SfxDispatcher* LocalGetDispatcher (const SfxBindings* pBindings)
     {
-        SfxDispatcher* pDispatcher = NULL;
+        SfxDispatcher* pDispatcher = nullptr;
 
-        if (SfxViewFrame::Current() != NULL)
+        if (SfxViewFrame::Current() != nullptr)
             pDispatcher = SfxViewFrame::Current()->GetDispatcher();
-        else if (pBindings != NULL)
+        else if (pBindings != nullptr)
             pDispatcher = pBindings->GetDispatcher();
 
         return pDispatcher;
@@ -90,16 +90,16 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
     , aImgLightOff(SVX_RES(RID_SVXIMAGE_LIGHT_OFF))
     , bUpdate(false)
     , eViewType(VIEWTYPE_GEO)
-    , pModel(NULL)
-    , pVDev(NULL)
-    , p3DView(NULL)
+    , pModel(nullptr)
+    , pVDev(nullptr)
+    , p3DView(nullptr)
     , pBindings(pInBindings)
-    , pControllerItem(0)
-    , pConvertTo3DItem(0)
-    , pConvertTo3DLatheItem(0)
+    , pControllerItem(nullptr)
+    , pConvertTo3DItem(nullptr)
+    , pConvertTo3DLatheItem(nullptr)
     , mpImpl(new Svx3DWinImpl())
     , ePoolUnit(SFX_MAPUNIT_MM)
-    , mpRemember2DAttributes(NULL)
+    , mpRemember2DAttributes(nullptr)
     , bOnly3DChanged(false)
 {
     get(m_pBtnGeo, "geometry");
@@ -203,7 +203,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
     get(m_pBtnLatheObject, "tolathe");
     get(m_pBtnPerspective, "perspective");
 
-    mpImpl->pPool = NULL;
+    mpImpl->pPool = nullptr;
 
     // Set Metric
     eFUnit = pInBindings->GetDispatcher()->GetModule()->GetFieldUnit();
@@ -306,7 +306,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
 
     // Initiation of the initialization of the ColorLBs
     SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
-    if (pDispatcher != NULL)
+    if (pDispatcher != nullptr)
     {
         SfxBoolItem aItem( SID_3D_INIT, true );
         pDispatcher->Execute(
@@ -368,7 +368,7 @@ void Svx3DWin::Reset()
     m_pMtrMatSpecularIntensity->SetValue( 50 );
 
     m_pBtnLight1->Check();
-    ClickUpdateHdl( NULL );
+    ClickUpdateHdl( nullptr );
 
     // Select nothing, to avoid errors when selecting the first
     m_pCtlLightPreview->GetSvx3DLightControl().SelectLight(0);
@@ -2148,7 +2148,7 @@ IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickUpdateHdl, Button*, void)
     if( bUpdate )
     {
         SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
-        if (pDispatcher != NULL)
+        if (pDispatcher != nullptr)
         {
             SfxBoolItem aItem( SID_3D_STATE, true );
             pDispatcher->Execute(
@@ -2165,7 +2165,7 @@ IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickUpdateHdl, Button*, void)
 IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickAssignHdl, Button*, void)
 {
     SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
-    if (pDispatcher != NULL)
+    if (pDispatcher != nullptr)
     {
         SfxBoolItem aItem( SID_3D_ASSIGN, true );
         pDispatcher->Execute(
@@ -2419,7 +2419,7 @@ IMPL_LINK_TYPED( Svx3DWin, ClickHdl, Button *, pButton, void )
             bUpdatePreview = true;
         }
         // Other (no groups)
-        else if( pBtn != NULL )
+        else if( pBtn != nullptr )
         {
             pBtn->Check( !pBtn->IsChecked() );
             bUpdatePreview = true;
@@ -2428,7 +2428,7 @@ IMPL_LINK_TYPED( Svx3DWin, ClickHdl, Button *, pButton, void )
         if( nSId > 0 )
         {
             SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
-            if (pDispatcher != NULL)
+            if (pDispatcher != nullptr)
             {
                 SfxBoolItem aItem( nSId, true );
                 pDispatcher->Execute(
@@ -2626,7 +2626,7 @@ void Svx3DWin::ClickLight(PushButton& rBtn)
 IMPL_LINK_NOARG_TYPED(Svx3DWin, ChangeSelectionCallbackHdl, SvxLightCtl3D*, void)
 {
     const sal_uInt32 nLight(m_pCtlLightPreview->GetSvx3DLightControl().GetSelectedLight());
-    PushButton* pBtn = 0;
+    PushButton* pBtn = nullptr;
 
     switch( nLight )
     {
@@ -2722,14 +2722,14 @@ bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
 
 void Svx3DWin::UpdatePreview()
 {
-    if( pModel == NULL )
+    if( pModel == nullptr )
         pModel = new FmFormModel();
 
     if(bOnly3DChanged)
     {
         // Execute slot
         SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
-        if (pDispatcher != NULL)
+        if (pDispatcher != nullptr)
         {
             SfxBoolItem aItem( SID_3D_STATE, true );
             pDispatcher->Execute(
@@ -2753,7 +2753,7 @@ void Svx3DWin::UpdatePreview()
 void Svx3DWin::DocumentReload()
 {
     delete mpRemember2DAttributes;
-    mpRemember2DAttributes = 0L;
+    mpRemember2DAttributes = nullptr;
 }
 
 
@@ -2794,7 +2794,7 @@ sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn )
 {
     sal_uInt16 nLight = 8;
 
-    if( pBtn == NULL )
+    if( pBtn == nullptr )
     {
         if( m_pBtnLight1->IsChecked() )
             nLight = 0;
@@ -2838,9 +2838,9 @@ sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn )
 
 ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn )
 {
-    ColorLB* pLb = NULL;
+    ColorLB* pLb = nullptr;
 
-    if( pBtn == NULL )
+    if( pBtn == nullptr )
     {
         if( m_pBtnLight1->IsChecked() )
             pLb = m_pLbLight1;
@@ -2922,7 +2922,7 @@ void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState,
     {
         bState = bNewState;
         SfxDispatcher* pDispatcher = LocalGetDispatcher(&GetBindings());
-        if (pDispatcher != NULL)
+        if (pDispatcher != nullptr)
         {
             SfxBoolItem aItem( SID_3D_STATE, true );
             pDispatcher->Execute(