diff options
author | Noel Grandin <noel@peralex.com> | 2013-01-04 11:20:21 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-01-09 08:08:15 +0200 |
commit | 77d215ae2ed9bd08444a5128729066b6025bef27 (patch) | |
tree | 581ee6dc7eaaedd2cea591f64cbed17e3da507ac /uui/source/iahndl.hxx | |
parent | fd5a2eb07011e8aedfd5ef0a82edaf07221554ba (diff) |
fdo#46808, use new method OConfigurationTreeRoot::createWithComponentContext
.. everywhere that was using createWithServiceFactory, and delete the old
method.
Change-Id: I02cb2bfbcc2390494383579d2f14caa4fc5b8014
Diffstat (limited to 'uui/source/iahndl.hxx')
-rw-r--r-- | uui/source/iahndl.hxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index eee766753f92..8abe1fcb4b20 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -27,6 +27,7 @@ #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/beans/Optional.hpp" #include "com/sun/star/task/InteractionClassification.hpp" @@ -87,7 +88,7 @@ class UUIInteractionHelper { private: mutable osl::Mutex m_aPropertyMutex; - ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; + ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow > m_xWindowParam; const OUString m_aContextParam; StringHashMap m_aTypedCustomHandlers; @@ -97,14 +98,14 @@ private: public: UUIInteractionHelper( com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory, + com::sun::star::uno::XComponentContext > const & rxContext, com::sun::star::uno::Reference< com::sun::star::awt::XWindow > const & rxWindow, const OUString & rContextParam) SAL_THROW(()); UUIInteractionHelper( com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory) + com::sun::star::uno::XComponentContext > const & rxContext) SAL_THROW(()); ~UUIInteractionHelper() SAL_THROW(()); @@ -127,6 +128,9 @@ public: ::rtl::OUString aMessage, std::vector< rtl::OUString > const & rArguments ); + ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + getORB() const + { return m_xContext; } private: bool handleRequest_impl( |