strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mnemonics in words with Eszett misplaced

Browse source 
because the text is normalized with toUpper and uppercase
ß is SS and using the insertion index of the normalized
string in the original string is out by one

if we normalize with toLower then according to
icu/source/data/unidata/SpecialCasing.txt
then as long as the language is not Lithuanian
its always one to one

so just normalize to lower case with blank locale

Change-Id: I0ad1c7e2ad0216b7c27ec62105f9a25672ade8a8
This commit is contained in:
Caolán McNamara 2017-07-21 20:07:41 +01:00
parent 91795dfd72
commit 5488ff0be8
5 changed files with 102 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/vcl/mnemonic.hxx
View file

@ -31,14 +31,14 @@
#define MNEMONIC_RANGE_1_START 0x30
#define MNEMONIC_RANGE_1_END 0x39
// Latin A-Z
#define MNEMONIC_RANGE_2_START 0x41
#define MNEMONIC_RANGE_2_END 0x5A
#define MNEMONIC_RANGE_2_START 0x61
#define MNEMONIC_RANGE_2_END 0x7A
// Cyrillic
#define MNEMONIC_RANGE_3_START 0x0410
#define MNEMONIC_RANGE_3_END 0x042F
#define MNEMONIC_RANGE_3_START 0x0430
#define MNEMONIC_RANGE_3_END 0x044F
// Greek
#define MNEMONIC_RANGE_4_START 0x0391
#define MNEMONIC_RANGE_4_END 0x03AB
#define MNEMONIC_RANGE_4_START 0x03B1
#define MNEMONIC_RANGE_4_END 0x03CB
#define MNEMONIC_RANGES 4
#define MAX_MNEMONICS ((MNEMONIC_RANGE_1_END-MNEMONIC_RANGE_1_START+1)+\
(MNEMONIC_RANGE_2_END-MNEMONIC_RANGE_2_START+1)+\

49
vcl/CppunitTest_vcl_mnemonic.mk Normal file
View file

@ -0,0 +1,49 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_CppunitTest_CppunitTest,vcl_mnemonic))
$(eval $(call gb_CppunitTest_set_include,vcl_mnemonic,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
))
$(eval $(call gb_CppunitTest_add_exception_objects,vcl_mnemonic, \
vcl/qa/cppunit/mnemonic \
))
$(eval $(call gb_CppunitTest_use_externals,vcl_mnemonic,boost_headers))
$(eval $(call gb_CppunitTest_use_libraries,vcl_mnemonic, \
comphelper \
cppu \
cppuhelper \
sal \
svt \
test \
tl \
tk \
unotest \
vcl \
))
$(eval $(call gb_CppunitTest_use_sdk_api,vcl_mnemonic))
$(eval $(call gb_CppunitTest_use_ure,vcl_mnemonic))
$(eval $(call gb_CppunitTest_use_vcl,vcl_mnemonic))
$(eval $(call gb_CppunitTest_use_components,vcl_mnemonic,\
configmgr/source/configmgr \
i18npool/util/i18npool \
ucb/source/core/ucb1 \
))
$(eval $(call gb_CppunitTest_use_configuration,vcl_mnemonic))
# vim: set noet sw=4 ts=4:

1
vcl/Module_vcl.mk
View file

@ -149,6 +149,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_complextext \
CppunitTest_vcl_filters_test \
CppunitTest_vcl_mapmode \
CppunitTest_vcl_mnemonic \
CppunitTest_vcl_outdev \
CppunitTest_vcl_app_test \
CppunitTest_vcl_jpeg_read_write_test \

42
vcl/qa/cppunit/mnemonic.cxx Normal file
View file

@ -0,0 +1,42 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <test/bootstrapfixture.hxx>
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <osl/file.hxx>
#include <osl/process.h>
#include <vcl/mnemonic.hxx>
class VclMnemonicTest : public test::BootstrapFixture
{
public:
VclMnemonicTest() : BootstrapFixture(true, false) {}
void testMnemonic();
CPPUNIT_TEST_SUITE(VclMnemonicTest);
CPPUNIT_TEST(testMnemonic);
CPPUNIT_TEST_SUITE_END();
};
void VclMnemonicTest::testMnemonic()
{
MnemonicGenerator aGenerator;
OUString sResult = aGenerator.CreateMnemonic(OUString::fromUtf8(u8"ßa"));
CPPUNIT_ASSERT_EQUAL(sResult[1], sal_Unicode('~'));
}
CPPUNIT_TEST_SUITE_REGISTRATION(VclMnemonicTest);
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

10
vcl/source/window/mnemonic.cxx
View file

@ -72,14 +72,13 @@ sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey )
void MnemonicGenerator::RegisterMnemonic( const OUString& rKey )
{
const css::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale();
uno::Reference < i18n::XCharacterClassification > xCharClass = GetCharClass();
// Don't crash even when we don't have access to i18n service
if ( !xCharClass.is() )
return;
OUString aKey = xCharClass->toUpper( rKey, 0, rKey.getLength(), rLocale );
OUString aKey = xCharClass->toLower(rKey, 0, rKey.getLength(), css::lang::Locale());
// If we find a Mnemonic, set the flag. In other case count the
// characters, because we need this to set most as possible
@ -116,14 +115,13 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey )
if ( _rKey.isEmpty() || ImplFindMnemonic( _rKey ) )
return _rKey;
const css::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale();
uno::Reference < i18n::XCharacterClassification > xCharClass = GetCharClass();
// Don't crash even when we don't have access to i18n service
if ( !xCharClass.is() )
return _rKey;
OUString aKey = xCharClass->toUpper( _rKey, 0, _rKey.getLength(), rLocale );
OUString aKey = xCharClass->toLower(_rKey, 0, _rKey.getLength(), css::lang::Locale());
bool bChanged = false;
sal_Int32 nLen = aKey.getLength();
@ -255,7 +253,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey )
// Append Ascii Mnemonic
for ( c = MNEMONIC_RANGE_2_START; c <= MNEMONIC_RANGE_2_END; c++ )
{
nMnemonicIndex = ImplGetMnemonicIndex( c );
nMnemonicIndex = ImplGetMnemonicIndex(sal_Unicode(rtl::toAsciiUpperCase(c)));
if ( nMnemonicIndex != MNEMONIC_INDEX_NOTFOUND )
{
if ( maMnemonics[nMnemonicIndex] )
@ -316,7 +314,7 @@ OUString MnemonicGenerator::EraseAllMnemonicChars( const OUString& rStr )
// check for CJK-style mnemonic
if( i > 0 && (i+2) < nLen )
{
sal_Unicode c = aStr[i+1];
sal_Unicode c = sal_Unicode(rtl::toAsciiUpperCase(aStr[i+1]));
if( aStr[ i-1 ] == '(' &&
aStr[ i+2 ] == ')' &&
c >= MNEMONIC_RANGE_2_START && c <= MNEMONIC_RANGE_2_END )