strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#131464: fix create an index of Writer in Japanese locale

Browse source 
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-by: Eike Rathke <erack@redhat.com>
This commit is contained in:
Julien Nabet 2020-03-22 14:48:39 +01:00 committed by Eike Rathke
parent 54d3760f7d
commit 1098ed05ed
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
View file

@ -63,7 +63,7 @@ sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry(
return result;
}
static const char first[] = "ja_phonetic (alphanumeric first)";
static const 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 char last[] = "ja_phonetic (alphanumeric last)";
static const 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 )