diff options
| author | Eike Rathke <erack@redhat.com> | 2012-11-22 12:26:52 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-11-22 12:34:59 +0100 |
| commit | 9955dbebbdf1b7d36fec272dfea46f57fab47e19 (patch) | |
| tree | 80705ccc2382e7440ea76f62a544d64d12d1ce4f /desktop | |
| parent | 9c5d6ea5efb5f56a4ac96b4a8505ed84abbbc6bf (diff) | |
AllSettings with LanguageTag
Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 3 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_service.cxx | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 547ed4f57f6f..aa7083700b9a 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -349,6 +349,7 @@ ResMgr* Desktop::GetDesktopResManager() // Use VCL to get the correct language specific message as we // are in the bootstrap process and not able to get the installed // language!! + /* FIXME-BCP47: handle language tag! */ OUString aUILocaleString = LanguageSelection::getLanguageString(); sal_Int32 nIndex = 0; OUString aLanguage = aUILocaleString.getToken( 0, '-', nIndex); @@ -359,7 +360,7 @@ ResMgr* Desktop::GetDesktopResManager() Desktop::pResMgr = ResMgr::SearchCreateResMgr( "dkt", aLocale); AllSettings as = GetSettings(); - as.SetUILocale(aLocale); + as.SetUILanguageTag(LanguageTag(aLocale)); SetSettings(as); } } diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 20efb3011c20..b12b9927bd59 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -254,7 +254,7 @@ void ExtensionBox_Impl::Init() m_xRemoveListener = new ExtensionRemovedListener( this ); - m_pLocale = new lang::Locale( Application::GetSettings().GetLocale() ); + m_pLocale = new lang::Locale( Application::GetSettings().GetLanguageTag().getLocale() ); m_pCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() ); m_pCollator->loadDefaultCollator( *m_pLocale, i18n::CollatorOptions::CollatorOptions_IGNORE_CASE ); diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index d92ca972d939..de558fb27653 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -239,9 +239,7 @@ void ServiceImpl::startExecuteModal( throw RuntimeException( OUSTR("Cannot initialize VCL!"), static_cast<OWeakObject *>(this) ); AllSettings as = app->GetSettings(); - as.SetUILanguage( - LanguageTag( - utl::ConfigManager::getLocale() ).getLanguageType() ); + as.SetUILanguageTag( LanguageTag( utl::ConfigManager::getLocale() ) ); app->SetSettings( as ); app->SetDisplayName( utl::ConfigManager::getProductName() + |