tdf#95845 Add methods for menu labels to CommandInfoProvider

Change-Id: Ibf6a26940ec194f540255584776f8ebcefbb94ae

1 files changed, 24 insertions, 2 deletions

diff --git a/vcl/source/helper/commandinfoprovider.cxx b/vcl/source/helper/commandinfoprovider.cxx
index dde74417a14c..6a7e86802956 100644
--- a/vcl/source/helper/commandinfoprovider.cxx
+++ b/vcl/source/helper/commandinfoprovider.cxx
@@ -103,7 +103,6 @@ CommandInfoProvider::~CommandInfoProvider()
     }
 }
 
-
 OUString CommandInfoProvider::GetLabelForCommand (
     const OUString& rsCommandName,
     const Reference<frame::XFrame>& rxFrame)
@@ -113,6 +112,29 @@ OUString CommandInfoProvider::GetLabelForCommand (
     return GetCommandProperty("Name", rsCommandName);
 }
 
+OUString CommandInfoProvider::GetMenuLabelForCommand (
+    const OUString& rsCommandName,
+    const Reference<frame::XFrame>& rxFrame)
+{
+    SetFrame(rxFrame);
+
+    // Here we want to use "Label", not "Name". "Name" is a stripped-down version of "Label" without accelerators
+    // and ellipsis. In the menu, we want to have those accelerators and ellipsis.
+    return GetCommandProperty("Label", rsCommandName);
+}
+
+OUString CommandInfoProvider::GetPopupLabelForCommand (
+    const OUString& rsCommandName,
+    const css::uno::Reference<css::frame::XFrame>& rxFrame)
+{
+    SetFrame(rxFrame);
+
+    OUString sPopupLabel(GetCommandProperty("PopupLabel", rsCommandName));
+    if (!sPopupLabel.isEmpty())
+        return sPopupLabel;
+    return GetCommandProperty("Label", rsCommandName);
+}
+
 OUString CommandInfoProvider::GetTooltipForCommand (
     const OUString& rsCommandName,
     const Reference<frame::XFrame>& rxFrame,
@@ -122,7 +144,7 @@ OUString CommandInfoProvider::GetTooltipForCommand (
 
     OUString sLabel (GetCommandProperty("TooltipLabel", rsCommandName));
     if (sLabel.isEmpty())
-        sLabel = GetLabelForCommand(rsCommandName, rxFrame);
+        sLabel = GetCommandProperty("Name", rsCommandName);
 
     if (bIncludeShortcut) {
         const OUString sShortCut(GetCommandShortcut(rsCommandName, rxFrame));