diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-09 14:14:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-09 14:14:25 +0000 |
| commit | 20838a94f2d53ad6a448c97f4e7438b96d2258b8 (patch) | |
| tree | 871eb27127eee1b970cca189ac1f43fd351e19f8 | |
| parent | 26f6d5c5096a1f56f16fbe42b4307e7914ab4836 (diff) | |
INTEGRATION: CWS fwkpp2fix01 (1.77.48); FILE MERGED
2004/10/27 05:29:34 cd 1.77.48.1: #i36114# Fixed context help in toolboxes doesn't work
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 9c822f110e62..954725408bea 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: toolbox.cxx,v $ * - * $Revision: 1.77 $ + * $Revision: 1.78 $ * - * last change: $Author: obo $ $Date: 2004-09-09 16:33:49 $ + * last change: $Author: rt $ $Date: 2004-11-09 15:14:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -4797,13 +4797,20 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - ULONG nHelpId = GetHelpId( nItemId ); - if ( nHelpId ) + String aCommand = GetItemCommand( nItemId ); + ULONG nHelpId = GetHelpId( nItemId ); + + if ( aCommand.Len() || nHelpId ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); if ( pHelp ) - pHelp->Start( nHelpId, this ); + { + if ( aCommand.Len() ) + pHelp->Start( aCommand, this ); + else if ( nHelpId ) + pHelp->Start( nHelpId, this ); + } return; } } |