summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRishabh Kumar <kris.kr296@gmail.com>2015-08-18 03:11:53 +0530
committerNorbert Thiebaud <nthiebaud@gmail.com>2015-12-18 13:54:58 +0000
commitb2e78fc73363d3ee43e3ee7bc90237d6d048aef7 (patch)
tree7f19472c2ae636c9296797c2c8c6b38f017cc1e5
parent02002f83f156117cf178532d48abaa9319ee8cb4 (diff)
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@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
-rw-r--r--cui/source/customize/cfg.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 2b1cd622f02e..b1defa924e92 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3396,9 +3396,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;