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 )