[Libreoffice-commits] core.git: desktop/source

[Stephan Bergmann]

 desktop/source/app/userinstall.cxx |   23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

New commits:
commit 5e110ab8884bc033b4f2aab35bb3c8c520a2d8d1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Aug 23 17:04:57 2013 +0200

    /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

diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index c181faa..2098d1b 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()