diff options
Diffstat (limited to 'desktop/source/app/langselect.cxx')
-rw-r--r-- | desktop/source/app/langselect.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index bf6bb8cc6c..cf5dfcf0e4 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -146,7 +147,7 @@ bool LanguageSelection::prepareLanguage() try { Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.System/L10N/", sal_False), UNO_QUERY_THROW); - Any aWin16SysLocale = xProp->getPropertyValue(OUString::createFromAscii("SystemLocale")); + Any aWin16SysLocale = xProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("SystemLocale"))); ::rtl::OUString sWin16SysLocale; aWin16SysLocale >>= sWin16SysLocale; if( sWin16SysLocale.getLength()) @@ -370,12 +371,12 @@ Reference< XNameAccess > LanguageSelection::getConfigAccess(const sal_Char* pPat { Reference< XNameAccess > xNameAccess; try{ - OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"); + OUString sConfigSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")); OUString sAccessSrvc; if (bUpdate) - sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"); + sAccessSrvc = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")); else - sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"); + sAccessSrvc = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")); OUString sConfigURL = OUString::createFromAscii(pPath); @@ -415,7 +416,7 @@ Sequence< OUString > LanguageSelection::getInstalledLanguages() static Sequence< OUString > _getFallbackLocales(const OUString& aIsoLang) { Sequence< OUString > seqFallbacks; - if (aIsoLang.equalsAscii("zh-HK")) { + if (aIsoLang.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh-HK"))) { seqFallbacks = Sequence< OUString >(1); seqFallbacks[0] = OUString::createFromAscii("zh-TW"); } @@ -489,7 +490,7 @@ OUString LanguageSelection::getUserLanguage() { try { - xAccess->getByName(OUString::createFromAscii("UILocale")) >>= aUserLanguage; + xAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("UILocale"))) >>= aUserLanguage; } catch ( NoSuchElementException const & ) { @@ -513,7 +514,7 @@ OUString LanguageSelection::getSystemLanguage() { try { - xAccess->getByName(OUString::createFromAscii("UILocale")) >>= aUserLanguage; + xAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("UILocale"))) >>= aUserLanguage; } catch ( NoSuchElementException const & ) { @@ -535,7 +536,7 @@ void LanguageSelection::resetUserLanguage() try { Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.Office.Linguistic/General", sal_True), UNO_QUERY_THROW); - xProp->setPropertyValue(OUString::createFromAscii("UILocale"), makeAny(OUString::createFromAscii(""))); + xProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("UILocale")), makeAny(OUString())); Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges(); } catch ( PropertyVetoException& ) @@ -556,3 +557,5 @@ LanguageSelection::LanguageSelectionStatus LanguageSelection::getStatus() } } // namespace desktop + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |