diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-10-22 13:31:38 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-10-22 17:47:55 +0200 |
| commit | 47a8db922ee6980c540c2223be5452bc6b2b2bbb (patch) | |
| tree | 7d42419420c1f2dbf50c8b36d8f68400f9dee160 | |
| parent | b3a49f990273c9fa6e2b90245c271a14b38280f0 (diff) | |
Resolves: rhbz#868479 / fdo#56281 doubled ~ in German ok/cancel translations
We have unix-specific code adding ~ to OK/Cancel. So don't add ~ if
string already contains those.
Though its an open question if the presence of ~ is a bad thing
for the Windows case. i.e. if we should have tooling to not
allow the OK/Cancel translations to contain ~ in the first place,
of if we should drop the ifdef UNX and do it globally now
Change-Id: I461c6ac9ca574ed188f51472919be82ec582e389
Signed-off-by: Petr Mladek <pmladek@suse.cz>
| -rw-r--r-- | vcl/source/control/button.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 99e1724e50d6..baa5c64b1e8a 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -152,12 +152,15 @@ XubString Button::GetStandardText( StandardButtonType eButton ) sal_uInt32 nResId = aResIdAry[(sal_uInt16)eButton].nResId; aText = ResId(nResId, *pResMgr).toString(); - // Windows (apparently) has some magic auto-accelerator evil around - // ok / cancel so add this only for Unix -#ifdef UNX - if( nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL ) - aText.Insert( String::CreateFromAscii("~"), 0 ); + if (nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL) + { +#ifndef WNT + // Windows (apparently) has some magic auto-accelerator evil around + // ok / cancel so add accelerators only for Unix + if (aText.Search('~') == STRING_NOTFOUND) + aText.Insert(String::CreateFromAscii("~"), 0); #endif + } } else { |