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/interactionhandler.cxx | |
| 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/interactionhandler.cxx')
| -rw-r--r-- | uui/source/interactionhandler.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index 76d23c355df2..bb5177e9c103 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -20,16 +20,16 @@ #include "iahndl.hxx" #include "interactionhandler.hxx" #include "comphelper/namedvaluecollection.hxx" +#include "comphelper/processfactory.hxx" #include "com/sun/star/awt/XWindow.hpp" using namespace com::sun::star; UUIInteractionHandler::UUIInteractionHandler( - uno::Reference< lang::XMultiServiceFactory > const & - rServiceFactory) + uno::Reference< uno::XComponentContext > const & + rxContext) SAL_THROW(()) - : m_xServiceFactory(rServiceFactory), - m_pImpl(new UUIInteractionHelper(m_xServiceFactory)) + : m_pImpl(new UUIInteractionHelper(rxContext)) { } @@ -68,6 +68,7 @@ UUIInteractionHandler::initialize( uno::Sequence< uno::Any > const & rArguments) throw (uno::Exception) { + uno::Reference<uno::XComponentContext> xContext = m_pImpl->getORB(); delete m_pImpl; // The old-style InteractionHandler service supported a sequence of @@ -91,7 +92,7 @@ UUIInteractionHandler::initialize( } } - m_pImpl = new UUIInteractionHelper(m_xServiceFactory, xWindow, aContext); + m_pImpl = new UUIInteractionHelper(xContext, xWindow, aContext); } void SAL_CALL @@ -145,7 +146,7 @@ UUIInteractionHandler::createInstance( { try { - return *new UUIInteractionHandler(rServiceFactory); + return *new UUIInteractionHandler(comphelper::getComponentContext(rServiceFactory)); } catch (std::bad_alloc const &) { |