diff options
| author | Eike Rathke <erack@redhat.com> | 2012-11-16 17:44:48 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-11-16 17:47:37 +0100 |
| commit | 2694fed55757e0827f16e881371d87ec9dcb74f9 (patch) | |
| tree | 2f180e4ead7c3577a245fd8fd080979e918ba006 /vcl/source/app | |
| parent | 59d33fcc19ec380f9af6e7c24a5e22e8e50428cc (diff) | |
use LanguageTag
Change-Id: I48187540869ba8750e83b1c5e9aa5cb84b1a5c9c
Diffstat (limited to 'vcl/source/app')
| -rw-r--r-- | vcl/source/app/i18nhelp.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/app/settings.cxx | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 0448bc7be075..895e86213101 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -22,7 +22,7 @@ #include "unotools/localedatawrapper.hxx" #include "unotools/transliterationwrapper.hxx" -#include "i18npool/mslangid.hxx" +#include "i18npool/languagetag.hxx" #include "rtl/ustrbuf.hxx" @@ -65,7 +65,7 @@ utl::TransliterationWrapper& vcl::I18nHelper::ImplGetTransliterationWrapper() co nModules |= i18n::TransliterationModules_IGNORE_CASE; ((vcl::I18nHelper*)this)->mpTransliterationWrapper = new utl::TransliterationWrapper( m_xContext, (i18n::TransliterationModules)nModules ); - ((vcl::I18nHelper*)this)->mpTransliterationWrapper->loadModuleIfNeeded( MsLangId::convertLocaleToLanguage( maLocale ) ); + ((vcl::I18nHelper*)this)->mpTransliterationWrapper->loadModuleIfNeeded( LanguageTag( maLocale ).getLanguageType() ); } return *mpTransliterationWrapper; } diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 72dc9066a6c7..82440fde45e2 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -22,6 +22,7 @@ #include "tools/debug.hxx" #include "i18npool/mslangid.hxx" +#include "i18npool/languagetag.hxx" #include "vcl/svapp.hxx" #include "vcl/event.hxx" @@ -1439,7 +1440,7 @@ void AllSettings::SetLocale( const ::com::sun::star::lang::Locale& rLocale ) if ( rLocale.Language.isEmpty() ) mpData->meLanguage = LANGUAGE_SYSTEM; else - mpData->meLanguage = MsLangId::convertLocaleToLanguage( rLocale ); + mpData->meLanguage = LanguageTag( rLocale ).getLanguageType( false); if ( mpData->mpLocaleDataWrapper ) { delete mpData->mpLocaleDataWrapper; @@ -1468,7 +1469,7 @@ void AllSettings::SetLanguage( LanguageType eLang ) CopyData(); mpData->meLanguage = eLang; - MsLangId::convertLanguageToLocale( GetLanguage(), ((AllSettings*)this)->mpData->maLocale ); + mpData->maLocale = LanguageTag( GetLanguage() ).getLocale(); if ( mpData->mpLocaleDataWrapper ) { delete mpData->mpLocaleDataWrapper; |