diff options
| author | Rishabh Kumar <kris.kr296@gmail.com> | 2015-08-18 03:11:53 +0530 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-11 10:58:06 +0000 |
| commit | 6f3ac91fabe1faa664aecfc535b49ee31fcb9beb (patch) | |
| tree | 725e029bc522238ce964faeda229fd18d9cc6d50 /cui | |
| parent | 5fdfacd425d71c85aa6a74a72d607e2cb7658e86 (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>
(cherry picked from commit b2e78fc73363d3ee43e3ee7bc90237d6d048aef7)
Reviewed-on: https://gerrit.libreoffice.org/20804
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/cfg.cxx | 7 |
1 files 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; |