diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-04 15:00:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-05 07:50:55 +0100 |
| commit | 0cc702232e4799f03a468d1e8014d050a683165e (patch) | |
| tree | 79a328ed3826547eb102626ad9c69f736d05232e /sfx2 | |
| parent | a8694d21a87c44f6008a3547f0b004a17253fdd6 (diff) | |
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>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objmisc.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/doc/objxtor.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/inc/objshimp.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index a199f99cb4d9..a7fc00a38aa8 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/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(); } } diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index ac2fd4eca9d3..093fbbc4ecc9 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/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 ) diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index 4f883c2f8d53..d31414b8588f 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/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; diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index a642771b2c1f..79fad18c8048 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/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(); |