diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-12-19 11:56:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-12-19 16:10:09 +0100 |
| commit | 429f80910484079e4ef10ca904710e40a14ed3c4 (patch) | |
| tree | 2ac30f4669175072df8d88e8ae3ace0a823ca692 /vcl/source/window/toolbox.cxx | |
| parent | 6996cddfb8b1aa45c77caf6cdc973b1e548cfe86 (diff) | |
Resolves: tdf#105602 fix extended help for non-dispatchable toolbox commands
Change-Id: I832a043ca5ae3a4030b9ac22447cecfabd3650c0
Reviewed-on: https://gerrit.libreoffice.org/65422
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/window/toolbox.cxx')
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 824f216ccf0c..4d203c6b9186 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -3792,6 +3792,17 @@ void ToolBox::Resize() } } +namespace +{ + bool DispatchableCommand(const OUString& rName) + { + return rName.startsWith(".uno") || + rName.startsWith("slot:") || + rName.startsWith("macro:") || + rName.startsWith("vnd.sun.star.script"); + } +} + const OUString& ToolBox::ImplGetHelpText( sal_uInt16 nItemId ) const { ImplToolItem* pItem = ImplGetItem( nItemId ); @@ -3803,7 +3814,7 @@ const OUString& ToolBox::ImplGetHelpText( sal_uInt16 nItemId ) const Help* pHelp = Application::GetHelp(); if ( pHelp ) { - if ( pItem->maCommandStr.getLength() ) + if (DispatchableCommand(pItem->maCommandStr)) pItem->maHelpText = pHelp->GetHelpText( pItem->maCommandStr, this ); if ( pItem->maHelpText.isEmpty() && !pItem->maHelpId.isEmpty() ) pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); |