unotools/source/config/syslocaleoptions.cxx | 8 ++++---- unotools/source/i18n/transliterationwrapper.cxx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 7ccdadb57c18e53e887ac294a26f3756e7843927 Author: Eike Rathke <[email protected]> Date: Fri Nov 16 14:42:22 2012 +0100 use LanguageTag::reset() Change-Id: I592cb042465ceda960a0b34dfe3eb6d669868acf diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index b05837e..10c7574 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -291,11 +291,11 @@ void SvtSysLocaleOptions_Impl::MakeRealLocale() if (m_aLocaleString.isEmpty()) { LanguageType nLang = MsLangId::getSystemLanguage(); - m_aRealLocale = LanguageTag( nLang); + m_aRealLocale.reset( nLang); } else { - m_aRealLocale = LanguageTag( m_aLocaleString); + m_aRealLocale.reset( m_aLocaleString); } } @@ -304,11 +304,11 @@ void SvtSysLocaleOptions_Impl::MakeRealUILocale() if (m_aUILocaleString.isEmpty()) { LanguageType nLang = MsLangId::getSystemUILanguage(); - m_aRealUILocale = LanguageTag( nLang); + m_aRealUILocale.reset( nLang); } else { - m_aRealUILocale = LanguageTag( m_aUILocaleString); + m_aRealUILocale.reset( m_aUILocaleString); } } diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index 11f188e..a2c57fe 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -109,7 +109,7 @@ void TransliterationWrapper::setLanguageLocaleImpl( sal_uInt16 nLang ) { if( LANGUAGE_NONE == nLang ) nLang = LANGUAGE_SYSTEM; - aLanguageTag = LanguageTag( nLang); + aLanguageTag.reset( nLang); } @@ -175,7 +175,7 @@ void TransliterationWrapper::loadModuleByImplName( com::sun::star::lang::Locale aLocale( aLanguageTag.getLocale()); // Reset LanguageTag, so the next call to loadModuleIfNeeded() forces // new settings. - aLanguageTag = LanguageTag( LANGUAGE_DONTKNOW); + aLanguageTag.reset( LANGUAGE_DONTKNOW); if ( xTrans.is() ) xTrans->loadModuleByImplName( rModuleName, aLocale ); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
