diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-14 09:30:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-14 13:34:29 +0100 |
| commit | 9c90c5e4740763d116d1354d1e4315d338a92140 (patch) | |
| tree | cad98083f5eba4ca09dec0e24bb59800979c9992 /sfx2/source/view | |
| parent | c0ac7ae73480cd2b01f24e88c01bee507e8638f9 (diff) | |
loplugin:expandablemethods
Change-Id: Ia8192e03feda9e8ae70e29d8dc98d995f015f9ce
Reviewed-on: https://gerrit.libreoffice.org/85135
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/view')
| -rw-r--r-- | sfx2/source/view/frame.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/frame2.cxx | 5 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index ac7245e45966..945f6a5c027e 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -162,7 +162,7 @@ void SfxFrame::DoClose_Impl() if ( pImpl->bOwnsBindings ) DELETEZ( pBindings ); - Close(); + delete this; } bool SfxFrame::DocIsModified_Impl() diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 6fba3d141685..ba228e37e0d5 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -354,11 +354,6 @@ SystemWindow* SfxFrame::GetTopWindow_Impl() const } -void SfxFrame::Close() -{ - delete this; -} - void SfxFrame::LockResize_Impl( bool bLock ) { pImpl->bLockResize = bLock; diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index f0cf80dbe8f3..81f9d1fd4bdd 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1145,7 +1145,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl() m_xObjSh->DoClose(); SfxObjectShellRef xDyingObjSh = m_xObjSh; m_xObjSh.clear(); - if( GetHasTitle() && m_pImpl->nDocViewNo ) + if( GetFrame().GetHasTitle() && m_pImpl->nDocViewNo ) xDyingObjSh->GetNoSet_Impl().ReleaseIndex(m_pImpl->nDocViewNo-1); if ( m_pImpl->bObjLocked ) { |