diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-08-23 17:04:57 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-08-23 17:04:57 +0200 |
| commit | 5e110ab8884bc033b4f2aab35bb3c8c520a2d8d1 (patch) | |
| tree | 2b21d52d5dfc9d0f883e0afe34caa2dfd91224b6 /desktop | |
| parent | df06e968f6edfa812effe99a320c4ce14f036289 (diff) | |
/org.openoffice.Setup/Office/ooSetupInstCompleted is not localized
...so it makes no sense to localize the configuration provider when retrieving
its value. (The "real" call to the default configuration provider's setLocale
is in desktop::LanguageSelection::prepareLanguage anyway.)
Change-Id: I55e8177d83a480a433ab38f49cb8f49fea2f6c77
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/userinstall.cxx | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index c181faaf23f5..2098d1bd5d79 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -23,7 +23,6 @@ #include "sal/config.h" #include "userinstall.hxx" -#include "langselect.hxx" #include <stdio.h> #include <rtl/ustring.hxx> @@ -39,12 +38,7 @@ #include <unotools/bootstrap.hxx> #include <svl/languageoptions.hxx> #include <unotools/syslocaleoptions.hxx> -#include <comphelper/processfactory.hxx> -#include <com/sun/star/configuration/theDefaultProvider.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <i18nlangtag/mslangid.hxx> -#include <com/sun/star/lang/XLocalizable.hpp> -#include <com/sun/star/lang/Locale.hpp> #include "app.hxx" @@ -65,25 +59,14 @@ namespace desktop { { try { - Reference< XMultiServiceFactory > theConfigProvider( - com::sun::star::configuration::theDefaultProvider::get( - comphelper::getProcessComponentContext() ) ); - - // localize the provider to user selection - Reference< XLocalizable > localizable(theConfigProvider, UNO_QUERY_THROW); - OUString aUserLanguage = LanguageSelection::getLanguageString(); - LanguageTag aLanguageTag(aUserLanguage); - localizable->setLocale(aLanguageTag.getLocale( false)); - return officecfg::Setup::Office::ooSetupInstCompleted::get(); } catch (Exception const & e) { - OString msg(OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US)); - OSL_FAIL(msg.getStr()); + SAL_WARN( + "desktop.app", "ignoring Exception \"" << e.Message << "\""); + return false; } - - return false; } UserInstall::UserInstallStatus UserInstall::finalize() |