diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-30 14:20:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-30 18:53:57 +0200 |
| commit | c9dcd0a6197160fdc8bf086ae4d8a78558e7d078 (patch) | |
| tree | afaa73dd1d2bfa8353577d78667c5a91bd4f3ae2 /sfx2/source/view | |
| parent | 1ad14b32c651b23b2c37d83dbdea889607ea6680 (diff) | |
loplugin:returnconstant in sfx2
Change-Id: I9a41a2b53669bebfca573fef8d0d755e4621ce37
Reviewed-on: https://gerrit.libreoffice.org/58333
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 | 8 | ||||
| -rw-r--r-- | sfx2/source/view/frame2.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 82591b21c8fa..8ae28d2e291b 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -127,7 +127,7 @@ bool SfxFrame::DoClose() xFrame->dispose(); } else - bRet = DoClose_Impl(); + DoClose_Impl(); } catch( css::util::CloseVetoException& ) { @@ -142,7 +142,7 @@ bool SfxFrame::DoClose() return bRet; } -bool SfxFrame::DoClose_Impl() +void SfxFrame::DoClose_Impl() { SfxBindings* pBindings = nullptr; if ( pImpl->pCurrentViewFrame ) @@ -158,9 +158,7 @@ bool SfxFrame::DoClose_Impl() if ( pImpl->bOwnsBindings ) DELETEZ( pBindings ); - bool bRet = Close(); - DBG_ASSERT( bRet, "Impossible state: frame closes, but controller refuses!"); - return bRet; + Close(); } bool SfxFrame::DocIsModified_Impl() diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 6fc3cff26a7d..0f6c1af16799 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -343,10 +343,9 @@ SystemWindow* SfxFrame::GetTopWindow_Impl() const } -bool SfxFrame::Close() +void SfxFrame::Close() { delete this; - return true; } void SfxFrame::LockResize_Impl( bool bLock ) diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index d369cf65c4b6..24f25b86f663 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1089,7 +1089,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl() GetDispatcher()->SetDisableFlags( SfxDisableFlags::NONE ); } -bool SfxViewFrame::Close() +void SfxViewFrame::Close() { DBG_ASSERT( GetFrame().IsClosing_Impl() || !GetFrame().GetFrameInterface().is(), "ViewFrame closed too early!" ); @@ -1107,8 +1107,6 @@ bool SfxViewFrame::Close() // manner, thus it is better to let the dispatcher be. GetDispatcher()->Lock(true); delete this; - - return true; } void SfxViewFrame::DoActivate( bool bUI ) |