From cf32bd06da9d215e8a337ad611651664142e8a65 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Fri, 17 Jan 2014 19:21:56 +0100 Subject: fdo#73549 do not attempt to resolve an empty locale ... to match installed UI locales Change-Id: If0ad0fde392bc5ea3cf454f4858330f5e93a6666 (cherry picked from commit 8e826c7ff7c597e9f585377b2117f4dc24239dcc) fdo#73549 do not resolve empty locale here if not determined yet Change-Id: Iad03d6209a2b4024b27c6195195e5aa557c295fe (cherry picked from commit db6f8f9f8969b592ed90c841960fdd186e1cbc5a) do not resolve empty locale here when set, fdo#73549 related Change-Id: Id9c8c3926f64826fd2295e0f75f007ce435f5915 (cherry picked from commit 26fc9be1bf2d6aaeb52a571ea416f4527a52e146) Reviewed-on: https://gerrit.libreoffice.org/7529 Reviewed-by: Andras Timar Tested-by: Andras Timar --- configmgr/source/configurationprovider.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configmgr') diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index a4aaa15d9cdb..7293e9fb5733 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -324,7 +324,7 @@ void Service::setLocale(css::lang::Locale const & eLocale) throw (css::uno::RuntimeException) { osl::MutexGuard guard(*lock_); - locale_ = LanguageTag::convertToBcp47( eLocale); + locale_ = LanguageTag::convertToBcp47( eLocale, false); } css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException) { -- cgit