vcl/source/window/menu.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f95adbf3017cd1f68997fe242348bdf1647e09cd
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Dec 11 11:26:19 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Dec 11 14:53:19 2020 +0100
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 <caol...@redhat.com>
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
