diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-27 12:07:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-27 12:43:46 +0000 |
| commit | 337e19bf469c0a7a10fabd07fa6ae13f77075e36 (patch) | |
| tree | cbbb7c3f05eae32cf028c3009ab8f1b39e2bf5cb /sfx2/source/toolbox | |
| parent | 40241c2aec0e88cbb51b802bda2db458e14f792f (diff) | |
loplugin:expandablemethods in sfx2
Change-Id: I5dcc9e6e7fef210f85a01057ddf59f8de14b847d
Reviewed-on: https://gerrit.libreoffice.org/30320
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/toolbox')
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 7dc46f83f1d0..ff68c1ff93fa 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -842,7 +842,7 @@ void SfxPopupWindow::dispose() } -void SfxPopupWindow::GetOrCreateStatusListener() +void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL ) { if ( !m_xStatusListener.is() ) { @@ -852,12 +852,6 @@ void SfxPopupWindow::GetOrCreateStatusListener() this ); m_xStatusListener.set( static_cast< cppu::OWeakObject* >( m_pStatusListener ), UNO_QUERY ); } -} - - -void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL ) -{ - GetOrCreateStatusListener(); if ( m_xStatusListener.is() ) m_pStatusListener->addStatusListener( rCommandURL ); } @@ -881,7 +875,11 @@ void SfxPopupWindow::PopupModeEnd() if ( IsVisible() ) { // was teared-off - DeleteFloatingWindow(); + if ( m_bFloating ) + { + Hide(); + Delete(); + } m_bFloating = true; } else @@ -889,16 +887,6 @@ void SfxPopupWindow::PopupModeEnd() } -void SfxPopupWindow::DeleteFloatingWindow() -{ - if ( m_bFloating ) - { - Hide(); - Delete(); - } -} - - void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt ) { if ( !m_bCascading ) |