diff options
| author | Noel Grandin <noel@peralex.com> | 2013-01-04 09:12:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-01-09 08:08:14 +0200 |
| commit | fd5a2eb07011e8aedfd5ef0a82edaf07221554ba (patch) | |
| tree | cae1b578b1f5a3faea88499274c23303401a9439 /connectivity/inc | |
| parent | 3a50e97499d0c1ff6307dcfe9883aea1af300947 (diff) | |
fdo#46808, new method OConfigurationTreeRoot::createWithComponentContext
and use it to replace usage of createWithServiceFactory, and thus
replace usage of XMultiServiceFactory.
Change-Id: Id2f44066683ce17cf7a22f80916031556ef0e82a
Diffstat (limited to 'connectivity/inc')
| -rw-r--r-- | connectivity/inc/connectivity/DriversConfig.hxx | 9 | ||||
| -rw-r--r-- | connectivity/inc/connectivity/dbtools.hxx | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx index 4520112a3cca..72b22386e57a 100644 --- a/connectivity/inc/connectivity/DriversConfig.hxx +++ b/connectivity/inc/connectivity/DriversConfig.hxx @@ -20,7 +20,6 @@ #define CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED #include <comphelper/stl_types.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/uno/Sequence.h> #include "connectivity/dbtoolsdllapi.hxx" @@ -44,11 +43,11 @@ namespace connectivity { mutable ::utl::OConfigurationTreeRoot m_aInstalled; mutable TInstalledDrivers m_aDrivers; - void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) const; + void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB) const; public: DriversConfigImpl(); - const TInstalledDrivers& getInstalledDrivers(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) const { Load(_rxORB); return m_aDrivers; } + const TInstalledDrivers& getInstalledDrivers(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB) const { Load(_rxORB); return m_aDrivers; } }; // // Allows to access all driver which are located in the configuration @@ -59,7 +58,7 @@ namespace connectivity const ::comphelper::NamedValueCollection& impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const; public: - DriversConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); + DriversConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); ~DriversConfig(); DriversConfig( const DriversConfig& ); @@ -73,7 +72,7 @@ namespace connectivity ::com::sun::star::uno::Sequence< ::rtl::OUString > getURLs() const; private: OSharedConfigNode m_aNode; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xORB; }; } #endif // CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx index 1fd66e910bf3..78734d8abe27 100644 --- a/connectivity/inc/connectivity/dbtools.hxx +++ b/connectivity/inc/connectivity/dbtools.hxx @@ -375,7 +375,7 @@ namespace dbtools ::com::sun::star::uno::Any& /* [out] */ _rSettingsValue ); - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getDefaultReportEngineServiceName(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getDefaultReportEngineServiceName(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); /** quote the given name with the given quote string. */ |