framework/source/uielement/toolbarmanager.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 8383175bd3c714c163eac40a00b1e8277d4d5307
Author: Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Jun 24 16:02:02 2021 +0300
Commit: Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Jun 25 11:54:02 2021 +0200
tdf#143047: When no properties for command, use those from item container
This allows to use the "Label" property defined by user for macro
items, that indeed have no built-in command properties. Thus the
resulting tooltip will be a concatenation of the label and mnemonic
instead of only mnemonic as happened before.
Change-Id: I79d933fecd09ca7d64b7a3e7db0ef194e42c1c55
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117787
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index ad52608c5b0c..0bd0d627ff9d 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1416,6 +1416,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
if (( nType == css::ui::ItemType::DEFAULT ) && !aCommandURL.isEmpty() )
{
auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(aCommandURL, m_aModuleIdentifier);
+ if (!aProperties.hasElements()) // E.g., user-provided macro command?
+ aProperties = aProps; // Use existing info, including user-provided Label
OUString aString(vcl::CommandInfoProvider::GetLabelForCommand(aProperties));
ToolBoxItemBits nItemBits = ConvertStyleToToolboxItemBits( nStyle );