diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-12-11 11:26:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-12-11 14:53:19 +0100 |
| commit | f95adbf3017cd1f68997fe242348bdf1647e09cd (patch) | |
| tree | 9b63ad7b32ac0fa60d7fd195d49ae9881a647684 | |
| parent | ba8df6426d3e695a81aa0dce0ad42983bdb1222a (diff) | |
tdf#76644 extended tips not shown for 'gen' menu items
since...
commit d7fe5ab30ca9df722eec33d428baedd258075eac
Date: Thu Aug 1 11:23:58 2013 +0200
convert vcl/menu.hxx from XubString to OUString (second attempt)
probably currently only useful with HELP_DEBUG=1
Change-Id: I66e94e57e117d4e1d83f132a82377b28d3674d86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107591
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/window/menu.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index ea08e0a05855..95b776a5a20a 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1086,7 +1086,10 @@ OUString Menu::ImplGetHelpText( sal_uInt16 nItemId ) const { MenuItemData* pData = pItemList->GetData( nItemId ); - if ( pData && pData->aHelpText.isEmpty() && + if (!pData) + return OUString(); + + if ( pData->aHelpText.isEmpty() && (( !pData->aHelpId.isEmpty() ) || ( !pData->aCommandStr.isEmpty() ))) { Help* pHelp = Application::GetHelp(); @@ -1099,7 +1102,7 @@ OUString Menu::ImplGetHelpText( sal_uInt16 nItemId ) const } } - return OUString(); + return pData->aHelpText; } OUString Menu::GetHelpText( sal_uInt16 nItemId ) const |