diff options
| author | Noel Grandin <noel@peralex.com> | 2013-05-21 17:38:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-05-22 15:20:07 +0200 |
| commit | fe1ac1bf904ec7905187c3c3a5fe6a90f31f94e7 (patch) | |
| tree | 8c6987a93d453b2b4cabf8ed0a331a8296d52a27 /framework/source/dispatch/dispatchinformationprovider.cxx | |
| parent | 7298a2b0c721004b09a0fd3c7e287d655f42286b (diff) | |
fdo#46808, convert XMultiServiceFactory to XComponentContext
Change-Id: I5ed0b12bf37e7d235fc88182c006a6ed07ef2343
Diffstat (limited to 'framework/source/dispatch/dispatchinformationprovider.cxx')
| -rw-r--r-- | framework/source/dispatch/dispatchinformationprovider.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index 5e2435a6366e..a40c746bd784 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -35,10 +35,10 @@ DEFINE_XINTERFACE_1(DispatchInformationProvider , DIRECT_INTERFACE(css::frame::XDispatchInformationProvider)) //_________________________________________________________________________________________________________________ -DispatchInformationProvider::DispatchInformationProvider(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , - const css::uno::Reference< css::frame::XFrame >& xFrame) +DispatchInformationProvider::DispatchInformationProvider(const css::uno::Reference< css::uno::XComponentContext >& xContext , + const css::uno::Reference< css::frame::XFrame >& xFrame) : ThreadHelpBase(&Application::GetSolarMutex()) - , m_xSMGR (xSMGR ) + , m_xContext (xContext ) , m_xFrame (xFrame ) { } @@ -135,21 +135,22 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; - css::uno::Reference< css::frame::XFrame > xFrame(m_xFrame.get(), css::uno::UNO_QUERY); + css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext; + css::uno::Reference< css::frame::XFrame > xFrame(m_xFrame.get(), css::uno::UNO_QUERY); aReadLock.unlock(); // <- SAFE ---------------------------------- if (!xFrame.is()) return css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > >(); - CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, OUString("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself! + CloseDispatcher* pCloser = new CloseDispatcher(xContext, xFrame, OUString("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself! css::uno::Reference< css::uno::XInterface > xCloser(static_cast< css::frame::XDispatch* >(pCloser), css::uno::UNO_QUERY); css::uno::Reference< css::frame::XDispatchInformationProvider > xCloseDispatch(xCloser , css::uno::UNO_QUERY); css::uno::Reference< css::frame::XDispatchInformationProvider > xController (xFrame->getController() , css::uno::UNO_QUERY); - css::uno::Reference< css::frame::XDispatchInformationProvider > xAppDispatcher(xSMGR->createInstance(IMPLEMENTATIONNAME_APPDISPATCHPROVIDER), css::uno::UNO_QUERY); - + css::uno::Reference< css::frame::XDispatchInformationProvider > xAppDispatcher( + css::uno::Reference<css::lang::XMultiServiceFactory>(xContext->getServiceManager(), css::uno::UNO_QUERY_THROW) + ->createInstance(IMPLEMENTATIONNAME_APPDISPATCHPROVIDER), css::uno::UNO_QUERY); css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > lProvider(3); lProvider[0] = xController ; lProvider[1] = xCloseDispatch; |