[Libreoffice-commits] core.git: 2 commits - i18npool/CustomTarget_collator.mk i18npool/source

[Andras Timar]

 i18npool/CustomTarget_collator.mk             |    1 +
 i18npool/source/collator/collator_unicode.cxx |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit b93107f3d510f19faa2e62dc965aea9f1b46898d
Author: Andras Timar <atimar at suse.com>
Date:   Mon Jun 17 09:24:47 2013 +0200

    typo fix, use ja_charset for Japanese
    
    Change-Id: I29b7db952a8cc9e0670e03dd79204486332aabe9

diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 45f63c7..89bfa05 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -165,7 +165,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
                     func = get_collator_data_hu_charset;
             } else if ( rLocale.Language == "ja" ) {
                 if ( rAlgorithm == "charset" )
-                    func = get_collator_data_hu_charset;
+                    func = get_collator_data_ja_charset;
                 else if ( rAlgorithm == "phonetic (alphanumeric first)" )
                     func = get_collator_data_ja_phonetic_alphanumeric_first;
                 else if ( rAlgorithm == "phonetic (alphanumeric last)" )
commit fb4542f3427c0b37463c5fa6bb5602ce423510d9
Author: Andras Timar <atimar at suse.com>
Date:   Mon Jun 17 09:23:38 2013 +0200

    fdo#65809 Sidama (sit-ET) collation data
    
    Change-Id: Icc68dcc44678f4151ff5d4a25dd8868218363341

diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk
index 22b24ad..04527bb 100644
--- a/i18npool/CustomTarget_collator.mk
+++ b/i18npool/CustomTarget_collator.mk
@@ -22,6 +22,7 @@ i18npool_COTXTS := \
     ln_charset.txt \
     my_dictionary.txt \
     ne_charset.txt \
+    sid_charset.txt \
     zh_charset.txt \
     zh_pinyin.txt \
     zh_radical.txt \
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 5771e71..45f63c7 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -74,6 +74,7 @@ const sal_uInt8* get_collator_data_ku_alphanumeric();
 const sal_uInt8* get_collator_data_ln_charset();
 const sal_uInt8* get_collator_data_my_dictionary();
 const sal_uInt8* get_collator_data_ne_charset();
+const sal_uInt8* get_collator_data_sid_charset();
 const sal_uInt8* get_collator_data_zh_TW_charset();
 const sal_uInt8* get_collator_data_zh_TW_radical();
 const sal_uInt8* get_collator_data_zh_TW_stroke();
@@ -184,6 +185,9 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
             } else if ( rLocale.Language == "ne" ) {
                 if ( rAlgorithm == "charset" )
                     func = get_collator_data_ne_charset;
+            } else if ( rLocale.Language == "sid" ) {
+                if ( rAlgorithm == "charset" )
+                    func = get_collator_data_sid_charset;
             } else if ( rLocale.Language == "zh" && (rLocale.Country == "TW" || rLocale.Country == "HK" || rLocale.Country == "MO") ) {
                 if ( rAlgorithm == "charset" )
                     func = get_collator_data_zh_TW_charset;