From 6f3ac91fabe1faa664aecfc535b49ee31fcb9beb Mon Sep 17 00:00:00 2001 From: Rishabh Kumar Date: Tue, 18 Aug 2015 03:11:53 +0530 Subject: tdf#80758:empty values in button name not respected MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Norbert Thiebaud (cherry picked from commit b2e78fc73363d3ee43e3ee7bc90237d6d048aef7) Reviewed-on: https://gerrit.libreoffice.org/20804 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/customize/cfg.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 4f9c7063c163..018cf392a196 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; -- cgit