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 /unotools | |
| 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 'unotools')
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index d07f6c164598..1c7a7f29ff9e 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -108,12 +108,18 @@ OUString utl::ConfigManager::getDefaultCurrency() { "L10N/ooSetupCurrency"); } -OUString utl::ConfigManager::getLocale() { +OUString utl::ConfigManager::getUILocale() { return getConfigurationString( "/org.openoffice.Setup", "L10N/ooLocale"); } +OUString utl::ConfigManager::getWorkLocale() { + return getConfigurationString( + "/org.openoffice.Setup", + "L10N/ooSetupSystemLocale"); +} + OUString utl::ConfigManager::getProductExtension() { return getConfigurationString( "/org.openoffice.Setup", |