[Libreoffice-commits] .: vcl/inc vcl/source

[Tor Lillqvist]

 vcl/inc/vcl/svapp.hxx          |    3 ---
 vcl/inc/vcl/toolbox.hxx        |    1 -
 vcl/source/app/help.cxx        |   11 -----------
 vcl/source/app/svapp.cxx       |   12 ------------
 vcl/source/window/menu.cxx     |    6 ------
 vcl/source/window/toolbox.cxx  |    1 -
 vcl/source/window/toolbox2.cxx |   13 -------------
 7 files changed, 47 deletions(-)

New commits:
commit 0dcf64ce2251dee4f3b645a5d8018b8ff31dff2b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jan 21 14:48:58 2011 +0200

    Remove ShowHelpStatusText and HideHelpStatusText and associated cruft
    
    These methods were not implemented by any subclass, and the
    implementations in the base class were empty. Still, the quite heavy
    (especially in our multi-lingual builds) GetHelpText() mechanism was
    called to get a string to pass to ShowHelpStatusText(). So just remove
    all of it. See see fdo#33088 and fdo#33315.

diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 4b0a20a..b05dd33 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -255,9 +255,6 @@ public:
     virtual void                ShowStatusText( const XubString& rText );
     virtual void                HideStatusText();
 
-    virtual void                ShowHelpStatusText( const XubString& rText );
-    virtual void                HideHelpStatusText();
-
     virtual void                FocusChanged();
     virtual void                DataChanged( const DataChangedEvent& rDCEvt );
 
diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx
index afede95..8196642 100644
--- a/vcl/inc/vcl/toolbox.hxx
+++ b/vcl/inc/vcl/toolbox.hxx
@@ -230,7 +230,6 @@ private:
                         mbCustomize:1,
                         mbCustomizeMode:1,
                         mbDragging:1,
-                        mbHideStatusText:1,
                         mbMenuStrings:1,
                         mbIsShift:1,
                         mbIsKeyEvent:1,
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index c6fc815..6159616 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -372,12 +372,6 @@ HelpTextWindow::~HelpTextWindow()
 
     if( this == ImplGetSVData()->maHelpData.mpHelpWin )
         ImplGetSVData()->maHelpData.mpHelpWin = NULL;
-
-    if ( maStatusText.Len() )
-    {
-        ImplSVData* pSVData = ImplGetSVData();
-        pSVData->mpApp->HideHelpStatusText();
-    }
 }
 
 // -----------------------------------------------------------------------
@@ -426,11 +420,6 @@ void HelpTextWindow::SetHelpText( const String& rHelpText )
 void HelpTextWindow::ImplShow()
 {
     ImplDelData aDogTag( this );
-    if ( maStatusText.Len() )
-    {
-        ImplSVData* pSVData = ImplGetSVData();
-        pSVData->mpApp->ShowHelpStatusText( maStatusText );
-    }
     Show( TRUE, SHOW_NOACTIVATE );
     if( !aDogTag.IsDelete() )
     Update();
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index b86477f..8b16d63 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -266,12 +266,6 @@ void Application::ShowStatusText( const XubString& )
 
 // -----------------------------------------------------------------------
 
-void Application::ShowHelpStatusText( const XubString& )
-{
-}
-
-// -----------------------------------------------------------------------
-
 void Application::ActivateExtHelp()
 {
 }
@@ -290,12 +284,6 @@ void Application::HideStatusText()
 
 // -----------------------------------------------------------------------
 
-void Application::HideHelpStatusText()
-{
-}
-
-// -----------------------------------------------------------------------
-
 void Application::FocusChanged()
 {
 }
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index be74bf3..b1fc14e 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1101,9 +1101,6 @@ void Menu::Deactivate()
     if( !aDelData.isDeleted() )
     {
         bInCallback = FALSE;
-
-        if ( this == pStartMenu )
-            GetpApp()->HideHelpStatusText();
     }
 }
 
@@ -1117,9 +1114,6 @@ void Menu::Highlight()
         if ( pStartMenu && ( pStartMenu != this ) )
             pStartMenu->aHighlightHdl.Call( this );
     }
-
-    if ( !aDelData.isDeleted() && GetCurItemId() )
-        GetpApp()->ShowHelpStatusText( GetHelpText( GetCurItemId() ) );
 }
 
 void Menu::ImplSelect()
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 5234e70..b931585 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1618,7 +1618,6 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle )
     mbCustomize       = FALSE;
     mbCustomizeMode   = FALSE;
     mbDragging        = FALSE;
-    mbHideStatusText  = FALSE;
     mbMenuStrings     = FALSE;
     mbIsShift		  = FALSE;
     mbIsKeyEvent = FALSE;
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 7bceb0a..ebceb02 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -507,12 +507,6 @@ void ToolBox::Deactivate()
     mnActivateCount--;
     ImplCallEventListeners( VCLEVENT_TOOLBOX_DEACTIVATE );
     maDeactivateHdl.Call( this );
-
-    if ( mbHideStatusText )
-    {
-        GetpApp()->HideHelpStatusText();
-        mbHideStatusText = FALSE;
-    }
 }
 
 // -----------------------------------------------------------------------
@@ -521,13 +515,6 @@ void ToolBox::Highlight()
 {
     ImplCallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHT );
     maHighlightHdl.Call( this );
-
-    XubString aStr = GetHelpText( mnCurItemId );
-    if ( aStr.Len() || mbHideStatusText )
-    {
-        GetpApp()->ShowHelpStatusText( aStr );
-        mbHideStatusText = TRUE;
-    }
 }
 
 // -----------------------------------------------------------------------