--- a/locales/loce32/src/ls_coltur.cpp Wed Sep 15 13:20:01 2010 +0300
+++ b/locales/loce32/src/ls_coltur.cpp Wed Oct 13 15:41:22 2010 +0300
@@ -23,15 +23,15 @@
const TUint KUidColturCollationMethod = 0x100059DD;
static const TUint32 TheColturKey[] =
- {
- 0x7540109,0x7540121,0x78e0121,0x8060109,0x8060121,0x85e0109,0x85e0121,0x88e0109,
- 0x88e0121,0x78d0109,0x78d0121,0x78e0109,
+ { // 10 keys
+ 0x7540109,0x7540121,0x78d0121,0x8060109,0x8060121,0x85e0109,0x85e0121,0x88e0109,
+ 0x88e0121,0x78d0109,
};
static const TUint32 TheColturIndex[] =
- {
- 0x49000a,0x690009,0x69000b,0x1310009,
- };
+ { // 1 indices
+ 0x1310009,
+ }; // 1 entries
static const TUint16 TheColturStringElement[] =
{
@@ -48,7 +48,7 @@
};
static const TCollationKeyTable TheColturTable =
- { TheColturKey, TheColturIndex, 4, TheColturStringElement, TheColturStringIndex, 9 };
+ { TheColturKey, TheColturIndex, 1, TheColturStringElement, TheColturStringIndex, 9 };
static const TCollationMethod TheCollationMethod[] =
{
@@ -72,30 +72,9 @@
2
};
-static const TUnicodeData TheUnicodeTurkishData[] = // property table
- {
- { 0, 0, 0, 0, 232, 1 }, // Character properties. See the definition of TUnicodeData in /include/unicode.h. Turkish LowerCase fix.
- { 1, 0, 0, 0, -199, 2 } // Turkish UpperCase fix.
- };
-static const TUnicodeDataRange TheUnicodeTurkishDataRange[] = // character range table
- {
-// This table defines characters 0x49 and 0x69
- { 0x0, -1 }, // characters 0x0-0x48 has index=-1 into above property table (-1 means not defined)
- { 0x49, 0 }, // characters 0x49-0x49 has index=0 into above property table, that is, 0x49 has property {0,0,0,0,232,1}
- { 0x4A, -1 }, // characters 0x4A-0x68 has index=-1
- { 0x69, 1 }, // character 0x69 has index=1 into above property table, 0x69 has property { 1, 0, 0, 0, -199, 2 }
- { 0x6A, -1 } // characters 0x6A-0x10FFFF has index=-1
- };
-const TUnicodeDataSet TheUnicodeTurkishDataSet =
- {
- TheUnicodeTurkishData, // address of above property table
- TheUnicodeTurkishDataRange, // character range table
- sizeof(TheUnicodeTurkishDataRange)/sizeof(TUnicodeDataRange) // character range table size (should be 3 in this case)
- };
-
// The one and only locale character set object.
const LCharSet TheCharSet =
{
- &TheUnicodeTurkishDataSet,
+ NULL,
&TheCollationDataSet
};