[Libreoffice-commits] .: dbaccess/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Oct 12 07:36:39 PDT 2010
dbaccess/source/ui/misc/UITools.cxx | 46 ++++++++++++++++++------------------
1 file changed, 23 insertions(+), 23 deletions(-)
New commits:
commit be3b404ee3acd82605ad6ff5023dfda8c5b189cc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 11 15:12:10 2010 +0100
#i112786# make ConfigManager a well-behaved singleton
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index e8bac6f..3679a6a 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
{
More information about the Libreoffice-commits
mailing list