summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-10-22 13:31:38 +0100
committerPetr Mladek <pmladek@suse.cz>2012-10-23 12:03:13 +0200
commit7dbcf00ffe16e61a9fbd7f58c6ed0c644d2e81ca (patch)
tree8980190358263ba4522d82a4b797730d72f0c494
parent5725f17bf8bf240348994ee671ad1a984e701f03 (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> Signed-off-by: Eike Rathke <erack@redhat.com> Signed-off-by: Andras Timar <timar74@gmail.com>
-rw-r--r--vcl/source/control/button.cxx13
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
{