i18npool/source/transliteration/textToPronounce_zh.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9db03b879b912d79060ab06f03a54d4a59e6ac65
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Wed Feb 9 20:49:03 2022 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Thu Feb 10 14:03:50 2022 +0100
i18npool: fix wrong static function symbols
I build a full-language WASM build and the WASM linker was
complaining about mismatching function signatures for
get_zh_zhuyin and get_zh_pinyin.
Turns out LO has two exported functions with the same name
but different signatures. For a static build, these collator
functions are renamed, so they don't clash, and this was
silently calling the wrong functions from
i18npool/source/indexentry.
Change-Id: I6afe1c3a289dfccea5a5fec41a9a6db37f4e19bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129741
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx
b/i18npool/source/transliteration/textToPronounce_zh.cxx
index ad33bdf31dca..7848c935cfab 100644
--- a/i18npool/source/transliteration/textToPronounce_zh.cxx
+++ b/i18npool/source/transliteration/textToPronounce_zh.cxx
@@ -126,8 +126,8 @@ TextToPronounce_zh::equals( const OUString & str1,
sal_Int32 pos1, sal_Int32 nCo
extern "C" {
-sal_uInt16** get_zh_zhuyin();
-sal_uInt16** get_zh_pinyin();
+sal_uInt16** get_collator_data_zh_zhuyin();
+sal_uInt16** get_collator_data_zh_pinyin();
}
@@ -137,7 +137,7 @@ TextToPinyin_zh_CN::TextToPinyin_zh_CN() :
#ifndef DISABLE_DYNLOADING
TextToPronounce_zh("get_zh_pinyin")
#else
- TextToPronounce_zh(get_zh_pinyin)
+ TextToPronounce_zh(get_collator_data_zh_pinyin)
#endif
{
transliterationName = "ChineseCharacterToPinyin";
@@ -148,7 +148,7 @@ TextToChuyin_zh_TW::TextToChuyin_zh_TW() :
#ifndef DISABLE_DYNLOADING
TextToPronounce_zh("get_zh_zhuyin")
#else
- TextToPronounce_zh(get_zh_zhuyin)
+ TextToPronounce_zh(get_collator_data_zh_zhuyin)
#endif
{
transliterationName = "ChineseCharacterToChuyin";
