diff options
| author | Jingtao Yan <yanjingtao@gmail.com> | 2016-01-07 10:28:31 -0500 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-01-18 22:53:27 +0100 |
| commit | a88e5d59fdf610a07635ca803e2d7193e34eb549 (patch) | |
| tree | 2d886dffe566dee0acd9879ca2c632cd1c0693b5 | |
| parent | ec16a47a8fbd663b13126bdb514bef48e8d1c073 (diff) | |
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@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 1b683de366f4caf82225c632f02cf0f58ae76490)
Reviewed-on: https://gerrit.libreoffice.org/21368
(cherry picked from commit 9059f747c50eaf99a3c065f90b598208edbcb86b)
| -rw-r--r-- | i18npool/source/collator/collator_unicode.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index 3eb93f364e2c..9ef6548528cd 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.appendAscii("get_").append(rLocale.Language).appendAscii("_"); 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" ) { |