vcl/source/control/button.cxx | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 7dbcf00ffe16e61a9fbd7f58c6ed0c644d2e81ca
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Oct 22 13:31:38 2012 +0100
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 <pmla...@suse.cz>
Signed-off-by: Eike Rathke <er...@redhat.com>
Signed-off-by: Andras Timar <tima...@gmail.com>
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 99e1724..baa5c64 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
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
