From 9cd038e5b89c978ea24ba7efa7c3152801190455 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Sat, 12 Mar 2011 18:57:32 -0600
Subject: fix mis-merge all-around.

---
 fpicker/source/unx/gnome/SalGtkPicker.cxx | 40 -------------------------------
 1 file changed, 40 deletions(-)

(limited to 'fpicker')

diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx
index 403e139485b4..94671521a6fc 100755
--- a/fpicker/source/unx/gnome/SalGtkPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx
@@ -223,46 +223,6 @@ gint RunDialog::run()
     return nStatus;
 }
 
-static void lcl_setGTKLanguage(const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr)
-{
-    static bool bSet = false;
-    if (bSet)
-        return;
-
-    OUString sUILocale;
-    try
-    {
-        uno::Reference<lang::XMultiServiceFactory> xConfigMgr =
-          uno::Reference<lang::XMultiServiceFactory>(xServiceMgr->createInstance(
-            OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
-              UNO_QUERY_THROW );
-
-        Sequence< Any > theArgs(1);
-        theArgs[ 0 ] <<= OUString::createFromAscii("org.openoffice.Office.Linguistic/General");
-
-        uno::Reference< container::XNameAccess > xNameAccess =
-          uno::Reference< container::XNameAccess >(xConfigMgr->createInstanceWithArguments(
-            OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), theArgs ),
-              UNO_QUERY_THROW );
-
-        if (xNameAccess.is())
-            xNameAccess->getByName(OUString::createFromAscii("UILocale")) >>= sUILocale;
-    } catch (...) {}
-
-    if (sUILocale.getLength())
-    {
-        sUILocale = sUILocale.replace('-', '_');
-        rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("LANGUAGE"));
-        osl_setEnvironment(envVar.pData, sUILocale.pData);
-    }
-    bSet = true;
-}
-
-SalGtkPicker::SalGtkPicker(const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr) : m_pDialog(0)
-{
-    lcl_setGTKLanguage(xServiceMgr);
-}
-
 static void lcl_setGTKLanguage(const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr)
 {
     static bool bSet = false;
-- 
cgit