diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-12-11 11:26:19 +0000 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2020-12-11 17:28:36 +0100 |
| commit | c918fad2cbc01e42394ac6ede21366a47532ecc2 (patch) | |
| tree | 344b8d3403f94a6bead4f9314cdef2b619fae072 | |
| parent | tdf#135217 DOCX import: remove no longer needed top/bottom margin sync (diff) | |
| download | core-c918fad2cbc01e42394ac6ede21366a47532ecc2.tar.gz core-c918fad2cbc01e42394ac6ede21366a47532ecc2.zip | |
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/+/107548
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.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 bcfbdbb37773..f48e1c3f0fbc 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 |