mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add test for CJK (~X) mnemonics

Browse Source 
Change-Id: I1f69c23dcde6d963ad9c3bc1f2d9178fe15eb27c
This commit is contained in:
Caolán McNamara
2017-07-22 12:42:43 +01:00
parent 86988a9eb3
commit dbc371c4be
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
vcl/qa/cppunit/mnemonic.cxx
View File

@@ -32,9 +32,24 @@ void VclMnemonicTest::testMnemonic()
{
MnemonicGenerator aGenerator;
const sal_Unicode TEST[] = { 0x00DF, 'a' };
OUString sResult = aGenerator.CreateMnemonic(OUString(TEST, SAL_N_ELEMENTS(TEST)));
CPPUNIT_ASSERT_EQUAL(u'~', sResult[1]);
{
const sal_Unicode TEST[] = { 0x00DF, 'a' };
OUString sResult = aGenerator.CreateMnemonic(OUString(TEST, SAL_N_ELEMENTS(TEST)));
CPPUNIT_ASSERT_EQUAL(u'~', sResult[1]);
}
{
const sal_Unicode TEST[] = { 0x4E00, 'b' };
OUString sResult = aGenerator.CreateMnemonic(OUString(TEST, SAL_N_ELEMENTS(TEST)));
CPPUNIT_ASSERT_EQUAL(u'~', sResult[1]);
}
{
const sal_Unicode TEST[] = { 0x4E00 };
OUString sResult = aGenerator.CreateMnemonic(OUString(TEST, SAL_N_ELEMENTS(TEST)));
CPPUNIT_ASSERT_EQUAL(OUString("(~C)"), sResult.copy(sResult.getLength() - 4));
}
}
CPPUNIT_TEST_SUITE_REGISTRATION(VclMnemonicTest);

4
vcl/source/window/mnemonic.cxx
View File

@@ -253,14 +253,14 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey )
// Append Ascii Mnemonic
for ( c = MNEMONIC_RANGE_2_START; c <= MNEMONIC_RANGE_2_END; c++ )
{
nMnemonicIndex = ImplGetMnemonicIndex(sal_Unicode(rtl::toAsciiUpperCase(c)));
nMnemonicIndex = ImplGetMnemonicIndex(c);
if ( nMnemonicIndex != MNEMONIC_INDEX_NOTFOUND )
{
if ( maMnemonics[nMnemonicIndex] )
{
maMnemonics[nMnemonicIndex] = 0;
OUString aStr = OUStringBuffer().
append('(').append(MNEMONIC_CHAR).append(c).
append('(').append(MNEMONIC_CHAR).append(sal_Unicode(rtl::toAsciiUpperCase(c))).
append(')').makeStringAndClear();
nIndex = rKey.getLength();
if( nIndex >= 2 )