Kaydet (Commit) bd3ea40e authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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.
üst 7ba80b24
......@@ -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 );
......
......@@ -230,7 +230,6 @@ private:
mbCustomize:1,
mbCustomizeMode:1,
mbDragging:1,
mbHideStatusText:1,
mbMenuStrings:1,
mbIsShift:1,
mbIsKeyEvent:1,
......
......@@ -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();
......
......@@ -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()
{
}
......
......@@ -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()
......
......@@ -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;
......
......@@ -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;
}
}
// -----------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment