[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - i18npool/source

[Jingtao Yan]

 i18npool/source/collator/collator_unicode.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 545400aa5fce1c8aba1c02f96b3052ad447de5cc
Author: Jingtao Yan <yanjingtao at gmail.com>
Date:   Thu Jan 7 10:28:31 2016 -0500

    tdf#95494 Calc can not sort Chinese word by stroke and radical,
    
    _length must at the tail of filename.
    
    Change-Id: I434e89bf052d8f3130bfca62d71eaf8588c2bac9
    Reviewed-on: https://gerrit.libreoffice.org/21213
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 1b683de366f4caf82225c632f02cf0f58ae76490)
    Reviewed-on: https://gerrit.libreoffice.org/21367

diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 3a83949..e52bf20 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -156,20 +156,20 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
                 aBuf.append("get_").append(rLocale.Language).append("_");
                 if ( rLocale.Language == "zh" ) {
                     OUString func_base = aBuf.makeStringAndClear();
-                    OUString funclen_base = func_base + "_length";
+                    OUString funclen_base = func_base;
                     if (OUString("TW HK MO").indexOf(rLocale.Country) >= 0)
                     {
                         func = reinterpret_cast<const sal_uInt8* (*)()>(osl_getFunctionSymbol(hModule,
                                     OUString(func_base + "TW_" + rAlgorithm).pData));
                         funclen = reinterpret_cast<size_t (*)()>(osl_getFunctionSymbol(hModule,
-                                    OUString(funclen_base + "TW_" + rAlgorithm).pData));
+                                    OUString(funclen_base + "TW_" + rAlgorithm + "_length").pData));
                     }
                     if (!func)
                     {
                         func = reinterpret_cast<const sal_uInt8* (*)()>(osl_getFunctionSymbol(
                                 hModule, OUString(func_base + rAlgorithm).pData));
                         funclen = reinterpret_cast<size_t (*)()>(osl_getFunctionSymbol(
-                                hModule, OUString(funclen_base + rAlgorithm).pData));
+                                hModule, OUString(funclen_base + rAlgorithm + "_length").pData));
                     }
                 } else {
                     if ( rLocale.Language == "ja" ) {