From 83767b65f9f64e878c5c7d242caec6a9fe1c767f Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 11 Oct 2010 15:12:10 +0100
Subject: #i112786# make ConfigManager a well-behaved singleton

---
 dbaccess/source/ui/misc/UITools.cxx | 46 ++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'dbaccess/source/ui')

diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 637a2d2c70cf..cae934fc0935 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1268,29 +1268,29 @@ void fillAutoIncrementValue(const Reference<XConnection>& _xConnection,
     return sName;
 }
 // -----------------------------------------------------------------------------
-    void AppendConfigToken( ::rtl::OUString& _rURL, sal_Bool _bQuestionMark )
-    {
-        Any aLocale =
-            ::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( ::utl::ConfigManager::LOCALE );
-        ::rtl::OUString sLocaleStr;
-        if ( !( aLocale >>= sLocaleStr ) )
-            // fallback is english
-            sLocaleStr = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
-
-        // query part exists?
-        if ( _bQuestionMark )
-            // no, so start with '?'
-            _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?"));
-        else
-            // yes, so only append with '&'
-            _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("&"));
-
-        // set parameters
-        _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Language="));
-        _rURL += sLocaleStr;
-        _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("&System="));
-        _rURL += SvtHelpOptions().GetSystem();
-    }
+void AppendConfigToken( ::rtl::OUString& _rURL, sal_Bool _bQuestionMark )
+{
+    Any aLocale =
+    ::utl::ConfigManager::GetConfigManager().GetDirectConfigProperty( ::utl::ConfigManager::LOCALE );
+    ::rtl::OUString sLocaleStr;
+    if ( !( aLocale >>= sLocaleStr ) )
+        // fallback is english
+        sLocaleStr = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
+
+    // query part exists?
+    if ( _bQuestionMark )
+        // no, so start with '?'
+        _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?"));
+    else
+        // yes, so only append with '&'
+        _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("&"));
+
+    // set parameters
+    _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Language="));
+    _rURL += sLocaleStr;
+    _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("&System="));
+    _rURL += SvtHelpOptions().GetSystem();
+}
 
 namespace
 {
-- 
cgit