organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues1 Projects Releases Wiki Activity Actions2

ICU-6677 use UnicodeString::fromUTF32() in CollData code, see initial ticket description

Browse source 
X-SVN-Rev: 25450
This commit is contained in:
Markus Scherer 2009-02-19 23:06:03 +00:00
parent c45ac93e07
commit 1bdabd9519
2 changed files with 6 additions and 8 deletions
icu4c/source/i18n
colldata.cppucol_imp.h

8
icu4c/source/i18n/colldata.cpp
View file

@ -775,11 +775,11 @@ bail:
return;
}
UChar hanRanges[] = {UCOL_FIRST_HAN, UCOL_LAST_HAN, UCOL_FIRST_HAN_COMPAT, UCOL_LAST_HAN_COMPAT, UCOL_FIRST_HAN_A, UCOL_LAST_HAN_A,
UCOL_FIRST_HAN_B_LEAD, UCOL_FIRST_HAN_B_TRAIL, UCOL_LAST_HAN_B_LEAD, UCOL_LAST_HAN_B_TRAIL};
UChar32 hanRanges[] = {UCOL_FIRST_HAN, UCOL_LAST_HAN, UCOL_FIRST_HAN_COMPAT, UCOL_LAST_HAN_COMPAT, UCOL_FIRST_HAN_A, UCOL_LAST_HAN_A,
UCOL_FIRST_HAN_B, UCOL_LAST_HAN_B};
UChar jamoRanges[] = {UCOL_FIRST_L_JAMO, UCOL_FIRST_V_JAMO, UCOL_FIRST_T_JAMO, UCOL_LAST_T_JAMO};
UnicodeString hanString(hanRanges, ARRAY_SIZE(hanRanges));
UnicodeString jamoString(jamoRanges, ARRAY_SIZE(jamoRanges));
UnicodeString hanString = UnicodeString::fromUTF32(hanRanges, ARRAY_SIZE(hanRanges));
UnicodeString jamoString(FALSE, jamoRanges, ARRAY_SIZE(jamoRanges));
CEList hanList(coll, hanString, status);
CEList jamoList(coll, jamoString, status);
int32_t j = 0;

6
icu4c/source/i18n/ucol_imp.h
View file

@ -401,10 +401,8 @@ uprv_init_pce(const struct UCollationElements *elems);
#define UCOL_LAST_HAN_COMPAT 0xFA2F
/* Han extension B is in plane 2 */
#define UCOL_FIRST_HAN_B_LEAD 0xD840
#define UCOL_FIRST_HAN_B_TRAIL 0xDC00
#define UCOL_LAST_HAN_B_LEAD 0xD869
#define UCOL_LAST_HAN_B_TRAIL 0xDEDF
#define UCOL_FIRST_HAN_B 0x20000
#define UCOL_LAST_HAN_B 0x2A6DF
/* Hangul range */
#define UCOL_FIRST_HANGUL 0xAC00