diff options
| author | Eike Rathke <erack@redhat.com> | 2018-10-12 17:39:14 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-10-12 19:25:14 +0200 |
| commit | e30f6a8c6b053e7a7b9c54fb3fdaed4e73bb5389 (patch) | |
| tree | 7627772b0014d7cac2e19031c65c80e3b52d6050 /desktop | |
| parent | 5d5e0da5c314773129d8153363e2892fc359a744 (diff) | |
tdf#119739 split ConfigManager::getLocale(), getUILocale(), getWorkLocale()
To prevent further confusion which is which, dbaccess
UserInformation already got that wrong since ever.
/org.openoffice.Setup/L10N/ooLocale is the UI locale.
/org.openoffice.Setup/L10N/ooSetupSystemLocale is the work locale.
Confusingly due to legacy when the setup program was a separate
binary that picked the UI ooLocale and later set up the default
(system) work locale as well.
Change-Id: I9a05ad39f5fb65c54076ff5789ba7a2cc06ad23a
Reviewed-on: https://gerrit.libreoffice.org/61725
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_resource.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index de11310bc7ca..bbe4b2ee286d 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1998,7 +1998,7 @@ void Desktop::OpenClients() OUString aHelpURL = "vnd.sun.star.help://" + aHelpModule + "/start?Language=" - + utl::ConfigManager::getLocale(); + + utl::ConfigManager::getUILocale(); #if defined UNX aHelpURL += "&System=UNX"; #elif defined WNT diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index a606c589bcc8..49a08f97eeb8 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -1086,7 +1086,7 @@ bool IpcThread::process(OString const & arguments, bool * waitProcessed) { } if (bShowHelp) { aHelpURLBuffer.append("?Language="); - aHelpURLBuffer.append(utl::ConfigManager::getLocale()); + aHelpURLBuffer.append(utl::ConfigManager::getUILocale()); #if defined UNX aHelpURLBuffer.append("&System=UNX"); #elif defined WNT diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx index 4f5671df9879..c6e9d2a18e3a 100644 --- a/desktop/source/deployment/misc/dp_resource.cxx +++ b/desktop/source/deployment/misc/dp_resource.cxx @@ -37,7 +37,7 @@ namespace { struct OfficeLocale : public rtl::StaticWithInit<LanguageTag, OfficeLocale> { const LanguageTag operator () () { - OUString slang(utl::ConfigManager::getLocale()); + OUString slang(utl::ConfigManager::getUILocale()); //fallback, the locale is currently only set when the user starts the //office for the first time. if (slang.isEmpty()) diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index 96b086878f58..e7f8a2927806 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -155,7 +155,7 @@ void CommandEnvironmentImpl::printLicense( Reference< css::i18n::XCollator > xCollator = css::i18n::Collator::create( m_xComponentContext ); xCollator->loadDefaultCollator( - LanguageTag(utl::ConfigManager::getLocale()).getLocale(), + LanguageTag(utl::ConfigManager::getUILocale()).getLocale(), css::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE); do |