diff options
| author | Noel Grandin <noel@peralex.com> | 2012-09-18 09:46:34 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-27 15:03:32 +0200 |
| commit | 9c00e38b431b57c3760f6c0aa774424b3239eeda (patch) | |
| tree | bfe1bdd57d15eafb617028243cf4ea892016a137 /connectivity/inc | |
| parent | 8c20367a2e6d61f830f6dc336761909e38a6bcca (diff) | |
fdo#46808, Adapt sdb::DatabaseContext UNO service to new style
Create a merged XDatabaseContext interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.
Quite a few IDL files had to be marked as published for this to work.
Change-Id: Ie9a0da88d8c33cc83fc9d2334ff83ab2744c222f
Diffstat (limited to 'connectivity/inc')
| -rw-r--r-- | connectivity/inc/connectivity/dbtools.hxx | 6 | ||||
| -rw-r--r-- | connectivity/inc/connectivity/virtualdbtools.hxx | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx index 4c08dd1cbde0..a0f8bc515db1 100644 --- a/connectivity/inc/connectivity/dbtools.hxx +++ b/connectivity/inc/connectivity/dbtools.hxx @@ -60,7 +60,9 @@ namespace lang { namespace container { class XNameAccess; } - +namespace uno { + class XComponentContext; +} namespace util { class XNumberFormatTypes; class XNumberFormatsSupplier; @@ -505,7 +507,7 @@ namespace dbtools sal_Int32 _nDataType); // return the datasource for the given datasource name OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> getDataSource(const ::rtl::OUString& _rsDataSourceName, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); /** search for a name that is NOT in the NameAcces @param _rxContainer diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/connectivity/inc/connectivity/virtualdbtools.hxx index dfd6ebad32f5..dafaa45c4988 100644 --- a/connectivity/inc/connectivity/virtualdbtools.hxx +++ b/connectivity/inc/connectivity/virtualdbtools.hxx @@ -61,6 +61,9 @@ namespace com { class XColumn; class SQLContext; } + namespace uno { + class XComponentContext; + } namespace container { class XNameAccess; } @@ -175,7 +178,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource( const ::rtl::OUString& _rsRegisteredName, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > |