[Libreoffice-commits] core.git: framework/source

[Samuel Mehrbrodt]

 framework/source/uielement/addonstoolbarmanager.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3ff17bda5ba3e627e9b996506dc72b68cf67483b
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Feb 29 17:46:30 2016 +0100

    tdf#98277 Extensions: Display shortcut in toolbar tooltip
    
    Change-Id: Icc16860d8b47a3724838fdb3dcb72dfb4398167d
    Reviewed-on: https://gerrit.libreoffice.org/22779
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index afe1551..a7391d1 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -255,6 +255,9 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
                 }
                 bAppendSeparator = false;
 
+                OUString aShortcut(vcl::CommandInfoProvider::Instance().GetCommandShortcut(aURL, m_xFrame));
+                if (!aShortcut.isEmpty())
+                    aTitle += " (" + aShortcut + ")";
                 m_pToolBar->InsertItem( nId, aTitle );
 
                 // don't setup images yet, AddonsToolbarWrapper::populateImages does that.