[Libreoffice-commits] .: Branch 'libreoffice-3-3-0' - vcl/source

[Tor Lillqvist]

 vcl/source/window/menu.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 6fc21aa74b4d2aba07d854d5d3c2f404905b40ef
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jan 18 16:25:52 2011 +0200

    Avoid GetHelpText() call which can be quite heavy
    
    GetHelpText() can cause a quite heavy sequence of file and directory
    lookups. See fdo#33088. As its return value here was just passed on to
    ShowHelpStatusText() which doesn't do anything at all, it was
    completely unnecessary. The GetHelpText() calls here caused the
    noticeable slowdown in highlighting menu items on Windows with lots of
    localised help files for some bundled extensions.
    
    Signed-off-by: Caolan McNamara <caolanm at redhat.com>
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Thorsten Behrens <thb at documentfoundation.org>
    Signed-off-by: fstrba at novell.com

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e4e2716..e269766 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1119,9 +1119,6 @@ void Menu::Highlight()
         if ( pStartMenu && ( pStartMenu != this ) )
             pStartMenu->aHighlightHdl.Call( this );
     }
-
-    if ( !aDelData.isDeleted() && GetCurItemId() )
-        GetpApp()->ShowHelpStatusText( GetHelpText( GetCurItemId() ) );
 }
 
 void Menu::ImplSelect()