use unique_ptr in SfxObjectShell_Impl

Change-Id: I3f3b0514bdb87f59d9c5f34d2d36dc63e8b1e33d
Reviewed-on: https://gerrit.libreoffice.org/64527
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

sfx2/source/doc/objmisc.cxx

@@ -985,13 +985,12 @@ void SfxObjectShell::CheckForBrokenDocSignatures_Impl()
 void SfxObjectShell::SetAutoLoad(
     const INetURLObject& rUrl, sal_uInt32 nTime, bool bReload )
 {
-    if ( pImpl->pReloadTimer )
-        DELETEZ(pImpl->pReloadTimer);
+    pImpl->pReloadTimer.reset();
     if ( bReload )
     {
-        pImpl->pReloadTimer = new AutoReloadTimer_Impl(
+        pImpl->pReloadTimer.reset(new AutoReloadTimer_Impl(
                                 rUrl.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ),
-                                nTime, this );
+                                nTime, this ));
         pImpl->pReloadTimer->Start();
     }
 }

sfx2/source/doc/objxtor.cxx

@@ -233,7 +233,6 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell )
     ,m_bConfigOptionsChecked( false )
     ,lErr(ERRCODE_NONE)
     ,nEventId ( SfxEventHintId::NONE )
-    ,pReloadTimer ( nullptr)
     ,nLoadedFlags ( SfxLoadedFlags::ALL )
     ,nFlagsInProgress( SfxLoadedFlags::NONE )
     ,bModalMode( false )
@@ -310,7 +309,7 @@ SfxObjectShell::~SfxObjectShell()
     SfxObjectShell::CloseInternal();
     pImpl->pBaseModel.set( nullptr );
 
-    DELETEZ( pImpl->pReloadTimer );
+    pImpl->pReloadTimer.reset();
 
     SfxApplication *pSfxApp = SfxGetpApp();
     if ( USHRT_MAX != pImpl->nVisualDocumentNumber && pSfxApp )

sfx2/source/inc/objshimp.hxx

@@ -96,7 +96,7 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
     ErrCode             lErr;
     SfxEventHintId      nEventId;           // If Open/Create as to be sent
                                             // before Activate
-    AutoReloadTimer_Impl *pReloadTimer;
+    std::unique_ptr<AutoReloadTimer_Impl> pReloadTimer;
     SfxLoadedFlags      nLoadedFlags;
     SfxLoadedFlags      nFlagsInProgress;
     bool                bModalMode;

sfx2/source/view/viewfrm.cxx

@@ -614,7 +614,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                     pView = GetNext( *pView, xOldObj );
                 }
 
-                DELETEZ( xOldObj->Get_Impl()->pReloadTimer );
+                xOldObj->Get_Impl()->pReloadTimer.reset();
 
                 std::unique_ptr<SfxItemSet> pNewSet;
                 std::shared_ptr<const SfxFilter> pFilter = pMedium->GetFilter();