diff options
| author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-22 22:47:26 +0100 |
|---|---|---|
| committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-22 22:47:26 +0100 |
| commit | f39607df602883c20c8769a1a2e77bcba1f880d9 (patch) | |
| tree | ca0c677a6829f74fdc42d1763e95f1c0e40e70f3 /toolkit/source/layout/core/translate.cxx | |
| parent | 8c779305bca6b2ca4badadb1ed0c89dc092f287f (diff) | |
RTL_CONSTASCII_USTRINGPARAM in libs-gui 08
Diffstat (limited to 'toolkit/source/layout/core/translate.cxx')
| -rw-r--r-- | toolkit/source/layout/core/translate.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/toolkit/source/layout/core/translate.cxx b/toolkit/source/layout/core/translate.cxx index 4d35f101ae21..009c64acbb74 100644 --- a/toolkit/source/layout/core/translate.cxx +++ b/toolkit/source/layout/core/translate.cxx @@ -54,19 +54,19 @@ static std::list<OUString> getLocaleSubdirList( lang::Locale const& rLocale ) { std::list<OUString> aSubdirs; - aSubdirs.push_front( OUString::createFromAscii( "." ) ); - aSubdirs.push_front( OUString::createFromAscii( "en-US" ) ); + aSubdirs.push_front( OUString(RTL_CONSTASCII_USTRINGPARAM(".")) ); + aSubdirs.push_front( OUString(RTL_CONSTASCII_USTRINGPARAM("en-US")) ); if ( rLocale.Language.getLength() ) aSubdirs.push_front( rLocale.Language ); if ( rLocale.Country.getLength() ) { OUString aLocaleCountry = rLocale.Language - + OUString::createFromAscii( "-" ) + + OUString(RTL_CONSTASCII_USTRINGPARAM("-")) + rLocale.Country; aSubdirs.push_front( aLocaleCountry ); if ( rLocale.Variant.getLength() ) aSubdirs.push_front( aLocaleCountry - + OUString::createFromAscii( "." ) + + OUString(RTL_CONSTASCII_USTRINGPARAM(".")) + rLocale.Variant ); } return aSubdirs; @@ -84,7 +84,7 @@ static OUString getFirstExisting( OUString const& aDir, std::list<OUString> const& aSubDirs, OUString const& aXMLName ) { - static OUString const aSlash = OUString::createFromAscii( "/" ); + static OUString const aSlash(RTL_CONSTASCII_USTRINGPARAM("/")); String aResult; for ( std::list<OUString>::const_iterator i = aSubDirs.begin(); i != aSubDirs.end(); i++ ) @@ -118,7 +118,7 @@ readRightTranslation( OUString const& aXMLName ) { OUString aShareUrl; Bootstrap::locateSharedData( aShareUrl ); - OUString aXMLUrl = aShareUrl + OUString::createFromAscii( "/layout" ); + OUString aXMLUrl = aShareUrl + OUString(RTL_CONSTASCII_USTRINGPARAM("/layout")); String aXMLDir; LocalFileHelper::ConvertURLToPhysicalName( aXMLUrl, aXMLDir ); aXMLFile = getFirstExisting( aXMLDir, aSubdirs, aXMLName ); |