diff --git a/ohos_icu4c/libicu.map b/ohos_icu4c/libicu.map index 50ca9424577a6da5fa342f0905b5a10d145411a9..44781763d8739f9f176a6a642c96d547de468298 100644 --- a/ohos_icu4c/libicu.map +++ b/ohos_icu4c/libicu.map @@ -523,6 +523,27 @@ u_strToUTF32WithSub; u_strFromUTF32WithSub; u_errorName; + u_charAge; + u_getUnicodeVersion; + uldn_open; + uldn_close; + uldn_getLocale; + uldn_getDialectHandling; + uldn_localeDisplayName; + uldn_languageDisplayName; + uldn_scriptDisplayName; + uldn_scriptCodeDisplayName; + uldn_regionDisplayName; + uldn_variantDisplayName; + uldn_keyDisplayName; + uldn_keyValueDisplayName; + uldn_openForContext; + uldn_getContext; + ulocdata_getCLDRVersion; + u_versionFromString; + u_versionFromUString; + u_versionToString; + u_getVersion; local: *; diff --git a/ohos_icu4c/src/icu_addon.cpp b/ohos_icu4c/src/icu_addon.cpp index efa1e068ea33df044366b0525961da69baca53db..7e594a1538a987b0889a0c87c324a558dc085162 100644 --- a/ohos_icu4c/src/icu_addon.cpp +++ b/ohos_icu4c/src/icu_addon.cpp @@ -33,6 +33,16 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef ICU_SUPPORT_LIBBEGETUTIL #include "parameter.h" @@ -565,6 +575,27 @@ bool g_isCustomLocale = false; #undef u_strToUTF32WithSub #undef u_strFromUTF32WithSub #undef u_errorName +#undef u_charAge +#undef u_getUnicodeVersion +#undef uldn_open +#undef uldn_close +#undef uldn_getLocale +#undef uldn_getDialectHandling +#undef uldn_localeDisplayName +#undef uldn_languageDisplayName +#undef uldn_scriptDisplayName +#undef uldn_scriptCodeDisplayName +#undef uldn_regionDisplayName +#undef uldn_variantDisplayName +#undef uldn_keyDisplayName +#undef uldn_keyValueDisplayName +#undef uldn_openForContext +#undef uldn_getContext +#undef ulocdata_getCLDRVersion +#undef u_versionFromString +#undef u_versionFromUString +#undef u_versionToString +#undef u_getVersion extern "C" { @@ -2841,4 +2872,101 @@ const char* u_errorName(UErrorCode code) { return U_ICU_ENTRY_POINT_RENAME(u_errorName)(code); } +void u_charAge(UChar32 c, UVersionInfo versionArray) +{ + U_ICU_ENTRY_POINT_RENAME(u_charAge)(c, versionArray); +} +void u_getUnicodeVersion(UVersionInfo versionArray) +{ + U_ICU_ENTRY_POINT_RENAME(u_getUnicodeVersion)(versionArray); +} +ULocaleDisplayNames* uldn_open(const char *locale, UDialectHandling dialectHandling, UErrorCode *pErrorCode) +{ + return U_ICU_ENTRY_POINT_RENAME(uldn_open)(locale, dialectHandling, pErrorCode); +} +void uldn_close(ULocaleDisplayNames *ldn) +{ + U_ICU_ENTRY_POINT_RENAME(uldn_close)(ldn); +} +const char* uldn_getLocale(const ULocaleDisplayNames *ldn) +{ + return U_ICU_ENTRY_POINT_RENAME(uldn_getLocale)(ldn); +} +UDialectHandling uldn_getDialectHandling(const ULocaleDisplayNames *ldn) +{ + return U_ICU_ENTRY_POINT_RENAME(uldn_getDialectHandling)(ldn); +} +int32_t uldn_localeDisplayName(const ULocaleDisplayNames *ldn, const char *locale, UChar *result, + int32_t maxResultSize, UErrorCode *pErrorCode) +{ + return U_ICU_ENTRY_POINT_RENAME(uldn_localeDisplayName)(ldn, locale, result, maxResultSize, pErrorCode); +} +int32_t uldn_languageDisplayName(const ULocaleDisplayNames *ldn, const char *lang, UChar *result, + int32_t maxResultSize, UErrorCode *pErrorCode) +{ + return U_ICU_ENTRY_POINT_RENAME(uldn_languageDisplayName)(ldn, lang, result, maxResultSize, pErrorCode); +} +int32_t uldn_scriptDisplayName(const ULocaleDisplayNames *ldn, const char *script, UChar *result, + int32_t maxResultSize, UErrorCode *pErrorCode) +{ + return U_ICU_ENTRY_POINT_RENAME(uldn_scriptDisplayName)(ldn, script, result, maxResultSize, pErrorCode); +} +int32_t uldn_scriptCodeDisplayName(const ULocaleDisplayNames *ldn, UScriptCode scriptCode, UChar *result, + int32_t maxResultSize, UErrorCode *pErrorCode) +{ + return U_ICU_ENTRY_POINT_RENAME(uldn_scriptCodeDisplayName)(ldn, + scriptCode, result, maxResultSize, pErrorCode); +} +int32_t uldn_regionDisplayName(const ULocaleDisplayNames *ldn, const char *region, UChar *result, + int32_t maxResultSize, UErrorCode *pErrorCode) +{ + return U_ICU_ENTRY_POINT_RENAME(uldn_regionDisplayName)(ldn, region, result, maxResultSize, pErrorCode); +} +int32_t uldn_variantDisplayName(const ULocaleDisplayNames *ldn, const char *variant, UChar *result, + int32_t maxResultSize, UErrorCode *pErrorCode) +{ + return U_ICU_ENTRY_POINT_RENAME(uldn_variantDisplayName)(ldn, + variant, result, maxResultSize, pErrorCode); +} +int32_t uldn_keyDisplayName(const ULocaleDisplayNames *ldn, const char *key, UChar *result, + int32_t maxResultSize, UErrorCode *pErrorCode) +{ + return U_ICU_ENTRY_POINT_RENAME(uldn_keyDisplayName)(ldn, key, result, maxResultSize, pErrorCode); +} +int32_t uldn_keyValueDisplayName(const ULocaleDisplayNames *ldn, const char *key, const char *value, + UChar *result, int32_t maxResultSize, UErrorCode *pErrorCode) +{ + return U_ICU_ENTRY_POINT_RENAME(uldn_keyValueDisplayName)(ldn, + key, value, result, maxResultSize, pErrorCode); +} +ULocaleDisplayNames* uldn_openForContext(const char *locale, UDisplayContext *contexts, + int32_t length, UErrorCode *pErrorCode) +{ + return U_ICU_ENTRY_POINT_RENAME(uldn_openForContext)(locale, contexts, length, pErrorCode); +} +UDisplayContext uldn_getContext(const ULocaleDisplayNames *ldn, UDisplayContextType type, + UErrorCode *pErrorCode) +{ + return U_ICU_ENTRY_POINT_RENAME(uldn_getContext)(ldn, type, pErrorCode); +} +void ulocdata_getCLDRVersion(UVersionInfo versionArray, UErrorCode *status) +{ + U_ICU_ENTRY_POINT_RENAME(ulocdata_getCLDRVersion)(versionArray, status); +} +void u_versionFromString(UVersionInfo versionArray, const char *versionString) +{ + U_ICU_ENTRY_POINT_RENAME(u_versionFromString)(versionArray, versionString); +} +void u_versionFromUString(UVersionInfo versionArray, const UChar *versionString) +{ + U_ICU_ENTRY_POINT_RENAME(u_versionFromUString)(versionArray, versionString); +} +void u_versionToString(const UVersionInfo versionArray, char *versionString) +{ + U_ICU_ENTRY_POINT_RENAME(u_versionToString)(versionArray, versionString); +} +void u_getVersion(UVersionInfo versionArray) +{ + U_ICU_ENTRY_POINT_RENAME(u_getVersion)(versionArray); +} } \ No newline at end of file