diff options
| author | Noel Grandin <noel@peralex.com> | 2013-01-07 17:46:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-01-15 09:56:00 +0200 |
| commit | 92f14ced5e6f613772792d863a8c2cfeddfdae04 (patch) | |
| tree | 320db909a032db6c3527eab2cce56ea5f84f6028 /dbaccess/inc | |
| parent | e7018375cdf0e5e542631df9dee6023ff80b7840 (diff) | |
fdo#46808, Adapt frame::TaskCreator UNO service to new style
The service already existed, it just did not have an IDL file.
Change-Id: I157c53d09b612da0178432100b8928013f811706
Diffstat (limited to 'dbaccess/inc')
| -rw-r--r-- | dbaccess/inc/dbsubcomponentcontroller.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/inc/genericcontroller.hxx | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/dbaccess/inc/dbsubcomponentcontroller.hxx b/dbaccess/inc/dbsubcomponentcontroller.hxx index d397974f7cf5..b709458d03da 100644 --- a/dbaccess/inc/dbsubcomponentcontroller.hxx +++ b/dbaccess/inc/dbsubcomponentcontroller.hxx @@ -163,7 +163,7 @@ namespace dbaui virtual ::rtl::OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); protected: - DBSubComponentController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxORB); + DBSubComponentController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxORB); virtual ~DBSubComponentController(); virtual void disconnect(); diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index ddcb323e97ce..e2da361b27de 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -42,7 +42,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/awt/XUserInputInterception.hpp> #include <comphelper/broadcasthelper.hxx> @@ -238,7 +237,7 @@ namespace dbaui OAsyncronousLink m_aAsyncCloseTask; // called when a task shoud be closed ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer; // needed sometimes - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ControllerFrame m_aCurrentFrame; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatcher; // for intercepting dispatches ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatcher; // dito @@ -260,7 +259,7 @@ namespace dbaui // ---------------------------------------------------------------- // methods - OGenericUnoController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM ); + OGenericUnoController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM ); const ::comphelper::NamedValueCollection& getInitParams() const { return m_aInitParameters; } @@ -401,7 +400,7 @@ namespace dbaui DECL_LINK(OnAsyncCloseTask, void*); public: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const { return m_xServiceFactory; } + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const { return m_xContext; } ODataView* getView() const { return m_pView; } void setView( ODataView& i_rView ) { m_pView = &i_rView; } void clearView() { m_pView = NULL; } |