[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - cui/source

[Rishabh Kumar]

 cui/source/customize/cfg.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 6f3ac91fabe1faa664aecfc535b49ee31fcb9beb
Author: Rishabh Kumar <kris.kr296 at gmail.com>
Date:   Tue Aug 18 03:11:53 2015 +0530

    tdf#80758:empty values in button name not respected
    
    In case of empty values , the accelerator character is passed
    as the button name which avoids extra spacing.
    
    Change-Id: I8a82f5226e17bf8977fb6a8fd59c99a244e59309
    Reviewed-on: https://gerrit.libreoffice.org/14498
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    (cherry picked from commit b2e78fc73363d3ee43e3ee7bc90237d6d048aef7)
    Reviewed-on: https://gerrit.libreoffice.org/20804
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 4f9c706..018cf39 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3403,9 +3403,12 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, vo
             if ( pNameDialog->Execute() == RET_OK ) {
                 pNameDialog->GetName(aNewName);
 
-                pEntry->SetName( aNewName );
-                m_pContentsListBox->SetEntryText( pActEntry, aNewName );
+                if( aNewName == "" ) //tdf#80758 - Accelerator character ("~") is passed as
+                    pEntry->SetName( "~" ); // the button name in case of empty values.
+                else
+                    pEntry->SetName( aNewName );
 
+                m_pContentsListBox->SetEntryText( pActEntry, aNewName );
                 bNeedsApply = true;
             }
             break;