diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-16 23:53:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-17 14:03:25 +0100 |
| commit | 1d0f8a1bfb295ee8871267c6af8d5a2836e97ae9 (patch) | |
| tree | 6de10fec3322101755bc3c5f20011cbbe54accbd /i18npool | |
| parent | 2b307d2796f45dc27846765ff0d485026779b6f7 (diff) | |
nutso static OUStrings
Change-Id: I104af905eb0d13864f70f44386b2b573fb26e513
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/localedata/localedata.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 85f5a5a52ab6..e23270e0bea9 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -1460,8 +1460,6 @@ oslGenericFunction SAL_CALL LocaleData::getFunctionSymbol( const Locale& rLocale } oslGenericFunction pSymbol = 0; - static OUString tw(RTL_CONSTASCII_USTRINGPARAM("TW")); - static OUString en_US(RTL_CONSTASCII_USTRINGPARAM("en_US")); sal_Int32 l = rLocale.Language.getLength(); sal_Int32 c = rLocale.Country.getLength(); @@ -1490,7 +1488,7 @@ oslGenericFunction SAL_CALL LocaleData::getFunctionSymbol( const Locale& rLocale { // if the country code is HK or MO, one more step to try TW. pSymbol = rLookupTable.getFunctionSymbolByName( - aBuf.append(rLocale.Language).append(under).append(tw).makeStringAndClear(), + aBuf.append(rLocale.Language).append(under).append("TW").makeStringAndClear(), pFunction, &pCachedItem); } @@ -1503,7 +1501,7 @@ oslGenericFunction SAL_CALL LocaleData::getFunctionSymbol( const Locale& rLocale if (!pSymbol) { // load default function with name <func>_en_US - pSymbol = rLookupTable.getFunctionSymbolByName(en_US, pFunction, &pCachedItem); + pSymbol = rLookupTable.getFunctionSymbolByName(OUString("en_US"), pFunction, &pCachedItem); } if (!pSymbol) |