diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-12-02 22:35:57 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-03 18:04:24 +0100 |
| commit | ce90f99a2d66c2b998ad3f9f028e2ea623a757f5 (patch) | |
| tree | ec8f3adaeca225e22ae41eee80be114aadc25d17 /i18npool | |
| parent | 249f09885bc06f580ec3aea5ccd7a09d8e91541d (diff) | |
fixes for where fast string operator+ is not perfectly source compatible
Change-Id: I80af0399037e4f68113338139e7f2ad2400e65ab
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/collator/collator_unicode.cxx | 4 | ||||
| -rw-r--r-- | i18npool/source/indexentry/indexentrysupplier_asian.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index c705ee9ca239..2ba089a43418 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -131,9 +131,9 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: OUString func_base = aBuf.makeStringAndClear(); if (OUString("TW HK MO").indexOf(rLocale.Country) >= 0) func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, - (func_base + OUString("TW_") + rAlgorithm).pData); + OUString(func_base + "TW_" + rAlgorithm).pData); if (!func) - func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, (func_base + rAlgorithm).pData); + func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, OUString(func_base + rAlgorithm).pData); } else { if ( rLocale.Language == "ja" ) { // replace algrithm name to implementation name. diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx index f77bc7d4676c..4df4d24c309f 100644 --- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx @@ -88,9 +88,9 @@ IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry, if (hModule) { 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("_TW_")+rAlgorithm).pData); + func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, OUString(get+rLocale.Language+"_TW_"+rAlgorithm).pData); if (!func) - func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString('_')+rAlgorithm).pData); + func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, OUString(get+rLocale.Language+OUString('_')+rAlgorithm).pData); } #else if ( rLocale.Language == "zh" && OUString( "TW HK MO" ).indexOf(rLocale.Country) >= 0 ) { |