diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-03-22 14:48:39 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2020-03-22 23:52:45 +0100 |
| commit | 2da5724c59625c6fbfbb47476cf5339e04ac8f67 (patch) | |
| tree | 5d5b27693383ac1e477ded6dd0ab8a6eee4d7846 | |
| parent | Missing test dependencies (diff) | |
| download | core-2da5724c59625c6fbfbb47476cf5339e04ac8f67.tar.gz core-2da5724c59625c6fbfbb47476cf5339e04ac8f67.zip | |
tdf#131464: fix create an index of Writer in Japanese locale
in i18npool/source/collator/collator_unicode.cxx, we got:
177 // replace algorithm name to implementation name.
178 if (rAlgorithm == "phonetic (alphanumeric first)")
179 aBuf.append("phonetic_alphanumeric_first");
180 else if (rAlgorithm == "phonetic (alphanumeric last)")
181 aBuf.append("phonetic_alphanumeric_last");
182 else
183 aBuf.append(rAlgorithm);
So don't add extra ja_ before "phonetic..."
Also we already add "ja" in buffer with line:
158 aBuf.append("get_").append(rLocale.Language).append("_");
so right functions from ICU will be retrieved
Change-Id: I163c3ca4bb4dcfa1e5d29313190c5ba3e6396c4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90877
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90820
Reviewed-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx index 012dbf3b65cb..30758b103cf3 100644 --- a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx @@ -63,7 +63,7 @@ sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry( return result; } -static const sal_Char first[] = "ja_phonetic (alphanumeric first)"; +static const sal_Char first[] = "phonetic (alphanumeric first)"; sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_syllable::loadAlgorithm( const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, sal_Int32 collatorOptions ) @@ -77,7 +77,7 @@ sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_consonant return collator->loadCollatorAlgorithm(first, rLocale, collatorOptions) == 0; } -static const sal_Char last[] = "ja_phonetic (alphanumeric last)"; +static const sal_Char last[] = "phonetic (alphanumeric last)"; sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_syllable::loadAlgorithm( const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, sal_Int32 collatorOptions ) |