diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-14 22:07:23 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-14 22:07:23 +0100 |
| commit | 8b75883b87c9f7989f98fb413f5e51200c52891c (patch) | |
| tree | 5eaf6d052d25c61654b4e06ffb67784eab9d263b /connectivity/source/drivers/hsqldb | |
| parent | f72516ed25d25963f497396985d56344eb3ff465 (diff) | |
Simplified some uses of css.configuration.theDefaultProvider.
* Retro-added new-style UNOIDL singleton specification for it, for easy
instantiation.
* Plus new comphelper::getComponentContext to map from XMultiServiceFactory
to XComponentContext.
Diffstat (limited to 'connectivity/source/drivers/hsqldb')
| -rw-r--r-- | connectivity/source/drivers/hsqldb/HDriver.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 7d2623a31452..d59d4cc6fd61 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -32,6 +32,7 @@ #include "hsqldb/HConnection.hxx" #include <osl/diagnose.h> #include "connectivity/dbexception.hxx" +#include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/sdbc/XDriverAccess.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> @@ -53,6 +54,7 @@ #include <osl/process.h> #include <connectivity/dbexception.hxx> #include <comphelper/namedvaluecollection.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <unotools/confignode.hxx> #include <unotools/ucbstreamhelper.hxx> @@ -837,13 +839,8 @@ namespace connectivity { //......................................................... Reference< XMultiServiceFactory > xConfigProvider( - _rxORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")) ), - UNO_QUERY - ); - OSL_ENSURE( xConfigProvider.is(), "lcl_getSystemLocale: could not create the config provider!" ); - - if ( !xConfigProvider.is() ) - return sLocaleString; + com::sun::star::configuration::theDefaultProvider::get( + comphelper::getComponentContext( _rxORB ) ) ); //......................................................... // arguments for creating the config access |