diff options
| author | Noel Grandin <noel@peralex.com> | 2020-07-22 10:26:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-23 11:56:22 +0200 |
| commit | d812521ec4e142d5fe291b1a2e8d167b41ee744c (patch) | |
| tree | d52428835c37141f5854f7434a5f0eec16fe3bf9 /connectivity/source/inc | |
| parent | 7667525aa78b803b52b62b1bbb907c2822692e89 (diff) | |
connectivity/odbc: create instances with uno constructors
See tdf#74608 for motivation.
Change-Id: I7cc971c7a99950a05804ae73f132c68e0c5a0625
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99186
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity/source/inc')
| -rw-r--r-- | connectivity/source/inc/odbc/ODriver.hxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx index c38eb502a215..29262aea777e 100644 --- a/connectivity/source/inc/odbc/ODriver.hxx +++ b/connectivity/source/inc/odbc/ODriver.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/compbase.hxx> #include <connectivity/odbc.hxx> #include <odbc/odbcbasedllapi.hxx> @@ -43,24 +43,19 @@ namespace connectivity::odbc // of all the Connection objects // for this Driver - css::uno::Reference< css::lang::XMultiServiceFactory > m_xORB; + css::uno::Reference< css::uno::XComponentContext > m_xContext; SQLHANDLE m_pDriverHandle; virtual SQLHANDLE EnvironmentHandle(OUString &_rPath) = 0; public: - ODBCDriver(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); + ODBCDriver(const css::uno::Reference< css::uno::XComponentContext >& rxContext); // only possibility to get the odbc functions virtual oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const = 0; // OComponentHelper virtual void SAL_CALL disposing() override; - // XInterface - /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static( ); - /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) override; @@ -74,7 +69,7 @@ namespace connectivity::odbc virtual sal_Int32 SAL_CALL getMajorVersion( ) override; virtual sal_Int32 SAL_CALL getMinorVersion( ) override; - const css::uno::Reference< css::lang::XMultiServiceFactory >& getORB() const { return m_xORB; } + const css::uno::Reference< css::uno::XComponentContext >& getContext() const { return m_xContext; } }; } |