i18npool/qa/cppunit/transliteration.cxx | 8 ++------ i18npool/util/i18npool.component | 6 +++--- 2 files changed, 5 insertions(+), 9 deletions(-)
New commits: commit 65710a8d0098752b1079680563a053c2770ec958 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Tue Apr 4 14:23:49 2023 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Tue Apr 4 16:42:58 2023 +0200 Fix typos in XML that broke three implementation elements The typos all originated with d2140a6320cd1cf4dea29b174cdb3bcb5261056b "i18npool: create instances with uno constructors", causing three intended constructor attributes to rather be plain character data. Which apparently went unnoticed until recently (see the TODOs resolved here that had been introduced with 456a146b9eb643655ae2bd336740e8c5536913aa "tdf#151971: Fix used implementation names of transliteration services"), in part because the Parser class in cppuhelper/source/servicemanager.cxx silently ignores any unexpected character data via xmlreader::XmlReader::Text::NONE.) Change-Id: Ia8fdbc09c67d10530b4d86dbbbde2b6b84038e66 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150021 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/i18npool/qa/cppunit/transliteration.cxx b/i18npool/qa/cppunit/transliteration.cxx index 77d82aa60eec..712a3c02244a 100644 --- a/i18npool/qa/cppunit/transliteration.cxx +++ b/i18npool/qa/cppunit/transliteration.cxx @@ -68,9 +68,7 @@ public: trans->loadModuleNew({ css::i18n::TransliterationModulesNew_NumToTextUpper_zh_CN }, {}); trans->loadModuleNew({ css::i18n::TransliterationModulesNew_NumToTextLower_zh_TW }, {}); trans->loadModuleNew({ css::i18n::TransliterationModulesNew_NumToTextUpper_zh_TW }, {}); -#if 0 //TODO: currently broken - trans->loadModuleNew({css::i18n::TransliterationModulesNew_NumToTextFormalHangul_ko}, {}); -#endif + trans->loadModuleNew({ css::i18n::TransliterationModulesNew_NumToTextFormalHangul_ko }, {}); trans->loadModuleNew({ css::i18n::TransliterationModulesNew_NumToTextFormalLower_ko }, {}); trans->loadModuleNew({ css::i18n::TransliterationModulesNew_NumToTextFormalUpper_ko }, {}); trans->loadModuleNew({ css::i18n::TransliterationModulesNew_NumToTextInformalHangul_ko }, @@ -102,9 +100,7 @@ public: {}); trans->loadModuleNew({ css::i18n::TransliterationModulesNew_TextToNumInformalUpper_ko }, {}); -#if 0 //TODO: currently broken - trans->loadModuleNew({css::i18n::TransliterationModulesNew_CharToNumLower_zh_CN}, {}); -#endif + trans->loadModuleNew({ css::i18n::TransliterationModulesNew_CharToNumLower_zh_CN }, {}); trans->loadModuleNew({ css::i18n::TransliterationModulesNew_CharToNumUpper_zh_CN }, {}); trans->loadModuleNew({ css::i18n::TransliterationModulesNew_CharToNumLower_zh_TW }, {}); trans->loadModuleNew({ css::i18n::TransliterationModulesNew_CharToNumUpper_zh_TW }, {}); diff --git a/i18npool/util/i18npool.component b/i18npool/util/i18npool.component index e3e437c875ee..b540f2bd98e2 100644 --- a/i18npool/util/i18npool.component +++ b/i18npool/util/i18npool.component @@ -226,7 +226,7 @@ constructor="i18npool_CharToNumLower_ko_get_implementation"> <service name="com.sun.star.i18n.Transliteration.l10n"/> </implementation> - <implementation name="com.sun.star.i18n.Transliteration.CharToNumLower_zh_CN"> + <implementation name="com.sun.star.i18n.Transliteration.CharToNumLower_zh_CN" constructor="i18npool_CharToNumLower_zh_CN_get_implementation"> <service name="com.sun.star.i18n.Transliteration.l10n"/> </implementation> @@ -354,7 +354,7 @@ <implementation name="com.sun.star.i18n.Transliteration.NumToTextDiZi_zh"> <service name="com.sun.star.i18n.Transliteration.l10n"/> </implementation> - <implementation name="com.sun.star.i18n.Transliteration.NumToTextFormalHangul_ko"> + <implementation name="com.sun.star.i18n.Transliteration.NumToTextFormalHangul_ko" constructor="i18npool_NumToTextFormalHangul_ko_get_implementation"> <service name="com.sun.star.i18n.Transliteration.l10n"/> </implementation> @@ -380,7 +380,7 @@ constructor="i18npool_NumToTextFullwidth_zh_TW_get_implementation"> <service name="com.sun.star.i18n.Transliteration.l10n"/> </implementation> - <implementation name="com.sun.star.i18n.Transliteration.NumToTextHangulCircledJamo_ko"> + <implementation name="com.sun.star.i18n.Transliteration.NumToTextHangulCircledJamo_ko" constructor="i18npool_NumToTextHangulCircledJamo_ko_get_implementation"> <service name="com.sun.star.i18n.Transliteration.l10n"/> </implementation>