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

[Samuel Mehrbrodt]

 framework/source/uielement/toolbarmanager.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6105812d67ce5369ff3a1b9690f2bc333a17e44d
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Fri Nov 13 06:42:09 2015 +0100

    Toolbar: Use 'Name', not 'Label' property for Toolbar items
    
    Name is a stripped-down version of Label (doesn't contain dots etc).
    Inadvertently changed in 9c2f197e8e945f584e718e889938c06fbf644897
    Thanks to Maxim for pointing this out.
    
    Change-Id: I7df5752af6c398cc216b7773e4506d401232c216

diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 8c5bb68..ecc3708 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1272,7 +1272,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
 
                 if (( nType == css::ui::ItemType::DEFAULT ) && !aCommandURL.isEmpty() )
                 {
-                    OUString aString( RetrieveFromCommand( "Label", aCommandURL ));
+                    OUString aString( RetrieveFromCommand( "Name", aCommandURL ));
                     OUString aTooltipFromCommand( RetrieveFromCommand( "TooltipLabel", aCommandURL ));
 
                     ToolBoxItemBits nItemBits = ConvertStyleToToolboxItemBits( nStyle );