expand out DELETEZ in sfx2

Change-Id: Iced9299be454f5260582b0b639aad8e5d362d730
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100620
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

sfx2/source/doc/objstor.cxx

@@ -2932,7 +2932,8 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& rFileName, const OUString&
             // TODO/LATER: disconnect the new file from the storage for the case when pure saving is done
             //       if storing has corrupted the file, probably it must be restored either here or
             //       by the storage
-            DELETEZ( pNewFile );
+            delete pNewFile;
+            pNewFile = nullptr;
         }
     }
     else
@@ -2942,11 +2943,12 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& rFileName, const OUString&
         // reconnect to the old storage
         DoSaveCompleted();
 
-        DELETEZ( pNewFile );
+        delete pNewFile;
+        pNewFile = nullptr;
     }
 
     if ( bCopyTo )
-        DELETEZ( pNewFile );
+        delete pNewFile;
     else if( !bOk )
         SetModified();
 

sfx2/source/doc/objxtor.cxx

@@ -324,7 +324,8 @@ SfxObjectShell::~SfxObjectShell()
         if (IsDocShared())
             FreeSharedFile( pMedium->GetURLObject().GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
 #endif
-        DELETEZ( pMedium );
+        delete pMedium;
+        pMedium = nullptr;
     }
 
     // The removing of the temporary file must be done as the latest step in the document destruction

sfx2/source/explorer/nochaos.cxx

@@ -145,8 +145,10 @@ sal_uInt16 CntItemPool::Release()
 
     if ( !nRefs )
     {
-        DELETEZ( _pThePool );
-        DELETEZ( pPoolDefs_Impl );
+        delete _pThePool;
+        _pThePool = nullptr;
+        delete pPoolDefs_Impl;
+        pPoolDefs_Impl = nullptr;
         return 0;
     }
 

sfx2/source/view/frame.cxx

@@ -143,7 +143,10 @@ void SfxFrame::DoClose_Impl()
         pImpl->pCurrentViewFrame->Close();
 
     if ( pImpl->bOwnsBindings )
-        DELETEZ( pBindings );
+    {
+        delete pBindings;
+        pBindings = nullptr;
+    }
 
     delete this;
 }

sfx2/source/view/ipclient.cxx

@@ -203,7 +203,8 @@ void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& a
 
 void SAL_CALL SfxInPlaceClient_Impl::disposing( const css::lang::EventObject& /*aEvent*/ )
 {
-    DELETEZ( m_pClient );
+    delete m_pClient;
+    m_pClient = nullptr;
 }
 
 // XEmbeddedClient