diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-30 15:00:23 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-30 16:41:40 -0500 |
| commit | 1488171272e5e9d11f751482e3e372e5db58418b (patch) | |
| tree | 1481a108540cf562bdaec78584bb8e0af9201d7d /i18npool/source/indexentry/indexentrysupplier_asian.cxx | |
| parent | 8016dced31517e1695af932efedcf9f83a28d741 (diff) | |
targeted string re-work
Change-Id: I1efff8e09079267f4129c474872d3fc49adeb831
Diffstat (limited to 'i18npool/source/indexentry/indexentrysupplier_asian.cxx')
| -rw-r--r-- | i18npool/source/indexentry/indexentrysupplier_asian.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx index 2e9ca9374dfa..fa697d2ad358 100644 --- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx @@ -49,9 +49,9 @@ IndexEntrySupplier_asian::IndexEntrySupplier_asian( implementationName = "com.sun.star.i18n.IndexEntrySupplier_asian"; #ifndef DISABLE_DYNLOADING #ifdef SAL_DLLPREFIX - OUString lib(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX"index_data" SAL_DLLEXTENSION)); + OUString lib(SAL_DLLPREFIX"index_data" SAL_DLLEXTENSION); #else - OUString lib(RTL_CONSTASCII_USTRINGPARAM("index_data" SAL_DLLEXTENSION)); + OUString lib("index_data" SAL_DLLEXTENSION); #endif hModule = osl_loadModuleRelative( &thisModule, lib.pData, SAL_LOADMODULE_DEFAULT ); @@ -95,9 +95,9 @@ IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry, sal_uInt16** (*func)(sal_Int16*)=NULL; #ifndef DISABLE_DYNLOADING if (hModule) { - OUString get(RTL_CONSTASCII_USTRINGPARAM("get_indexdata_")); + OUString get("get_indexdata_"); if ( rLocale.Language == "zh" && OUString( "TW HK MO" ).indexOf(rLocale.Country) >= 0 ) - func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString(RTL_CONSTASCII_USTRINGPARAM("_TW_"))+rAlgorithm).pData); + func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString("_TW_")+rAlgorithm).pData); if (!func) func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString('_')+rAlgorithm).pData); } @@ -173,7 +173,7 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry, if (hModule) { const sal_Char *func_name=NULL; if ( rLocale.Language == "zh" ) - func_name=(OUString(RTL_CONSTASCII_USTRINGPARAM("TW HK MO")).indexOf(rLocale.Country) >= 0) ? "get_zh_zhuyin" : "get_zh_pinyin"; + func_name=(OUString("TW HK MO").indexOf(rLocale.Country) >= 0) ? "get_zh_zhuyin" : "get_zh_pinyin"; else if ( rLocale.Language == "ko" ) func_name="get_ko_phonetic"; if (func_name) @@ -181,7 +181,7 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry, } #else if ( rLocale.Language == "zh" ) - func = (OUString(RTL_CONSTASCII_USTRINGPARAM("TW HK MO")).indexOf(rLocale.Country) >= 0) ? get_zh_zhuyin : get_zh_pinyin; + func = (OUString("TW HK MO").indexOf(rLocale.Country) >= 0) ? get_zh_zhuyin : get_zh_pinyin; else if ( rLocale.Language == "ko" ) func = get_ko_phonetic; |