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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 0e206c36d2a0..afa83643b87a 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -655,7 +655,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables() // Detect the language type of the current office m_aPreDefVars.m_eLanguageType = LANGUAGE_ENGLISH_US; - OUString aLocaleStr( utl::ConfigManager::getLocale() ); + OUString aLocaleStr( utl::ConfigManager::getUILocale() ); m_aPreDefVars.m_eLanguageType = LanguageTag::convertToLanguageTypeWithFallback( aLocaleStr ); // We used to have an else branch here with a SAL_WARN, but that // always fired in some unit tests when this code was built with |