diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-27 13:43:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-27 15:03:32 +0200 |
| commit | a00c4e02acd1b7a3ab126941166aa2d12c7eb3fc (patch) | |
| tree | 124a0877db6e0921b9a1237261106b63d94c1c9f /connectivity | |
| parent | 9c00e38b431b57c3760f6c0aa774424b3239eeda (diff) | |
Improvements on previous commit
* Made XDatabaseContext inherit XDatabaseRegistrations non-optionally, adapted
call-sites to just use XDatabaseContext w/o querying. (The previous commit
had inadvertantly effectively removed support for XDatabaseRegistrations from
the ODatabaseContext implementation, as an optional UNO super-interface does
not lead to a super-class in the corresponding C++ class hierarchy, but making
the super-interface non-optional fixes that anyway.)
* Adapted some more call-sites to just use XDatabaseContext w/o querying.
* Added @since tag.
* Replaced new uses of comphelper::ComponentContext::getUNOContext with
comphelper::getComponentContext (see 03a9f139bd9ea1a4f9096fc982e6b326def58532
"ComponentContext::getUnoContext -> getComponentContext simplification;" I
intend to get rid of comphelper/componentcontext.hxx much sooner than of
comphelper/processfactory.hxx).
Change-Id: I68d09f2dbe651629f79ed21cd40cdb6d6b32c624
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/dbtools.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 24f29a15729a..4674fe4d2571 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -63,9 +63,9 @@ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> -#include <comphelper/componentcontext.hxx> #include <comphelper/extract.hxx> #include <comphelper/interaction.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> #include <connectivity/conncleanup.hxx> #include <connectivity/dbconversion.hxx> @@ -281,7 +281,7 @@ Reference< XConnection > getConnection_allowException( const ::rtl::OUString& _rsPwd, const Reference< XMultiServiceFactory>& _rxFactory) { - Reference< XDataSource> xDataSource( getDataSource_allowException(_rsTitleOrPath, comphelper::ComponentContext(_rxFactory).getUNOContext()) ); + Reference< XDataSource> xDataSource( getDataSource_allowException(_rsTitleOrPath, comphelper::getComponentContext(_rxFactory)) ); Reference<XConnection> xConnection; if (xDataSource.is()) { |