summaryrefslogtreecommitdiff
path: root/vcl/source/window/mnemonic.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-06-30 13:30:21 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-06-30 13:30:21 +0000
commit08085046a410382cc91bc54e198203fb4a51bbcb (patch)
tree3468095f4f86bb1f3dc732b8bc6a448765bc20ec /vcl/source/window/mnemonic.cxx
parent714115c98783446786764552e19d6c58581c4472 (diff)
INTEGRATION: CWS vcl13 (1.10.12); FILE MERGED
2003/06/20 08:26:42 ssa 1.10.12.1: #110361# no CJK mnemonics for '...' and '>>'
Diffstat (limited to 'vcl/source/window/mnemonic.cxx')
-rw-r--r--vcl/source/window/mnemonic.cxx15
1 files changed, 13 insertions, 2 deletions
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index 2f55578ed328..b4e0b1b0f62b 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: mnemonic.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: hr $ $Date: 2003-06-16 11:35:22 $
+ * last change: $Author: hr $ $Date: 2003-06-30 14:30:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -201,6 +201,17 @@ BOOL MnemonicGenerator::CreateMnemonic( XubString& rKey )
// will get mnemonics in the form: xyz (M)
// thus steps 1) and 2) are skipped for CJK locales
+ // follow-up: #110361# but no CJK mnemonics for '...' an '>>'
+ if( bCJK && nLen <= 3 )
+ {
+ static sal_Unicode cDotDotDot[] = { 0xFF0E, 0xFF0E, 0xFF0E };
+ static sal_Unicode cGreaterGreater[] = { 0xFF1E, 0xFF1E };
+ if ( rKey.EqualsAscii( "..." ) || rKey.Equals( cDotDotDot ) ||
+ rKey.EqualsAscii( ">>") || rKey.Equals( cGreaterGreater ) )
+ return FALSE;
+ }
+
+
int nCJK = 0;
USHORT nMnemonicIndex;
sal_Unicode c;