From 1c7a54e3a14ad932e68b9281420e6c469e5dd2e5 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 4 Sep 2012 14:56:48 +0200 Subject: fdo#46808, Adapt frame::ModuleManager UNO service to new style Create a merged XModuleManager2 interface for this service to implement. Which is backwards-compatible, but does not require creating a new service. Explicitly document the XNameReplace interface in the IDL, which is already implemented by the service, since there is code currently using it. Change-Id: Ib46349174b1ce495c240031e93c9427fc33d9853 --- framework/source/lomenubar/FrameHelper.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'framework/source/lomenubar/FrameHelper.cxx') diff --git a/framework/source/lomenubar/FrameHelper.cxx b/framework/source/lomenubar/FrameHelper.cxx index b617404446af..e8fd68fb24ea 100644 --- a/framework/source/lomenubar/FrameHelper.cxx +++ b/framework/source/lomenubar/FrameHelper.cxx @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include @@ -268,7 +268,7 @@ FrameHelper::FrameHelper(const Reference< XMultiServiceFactory >& rServiceManag , m_pDispatchRegistry(new framework::lomenubar::DispatchRegistry(m_xStatusListener)) , m_xMSF(rServiceManager) , m_xTrans(util::URLTransformer::create(comphelper::ComponentContext(m_xMSF).getUNOContext())) - , m_xMM(m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"))),UNO_QUERY) + , m_xMM(frame::ModuleManager(comphelper::ComponentContext(m_xMSF).getUNOContext()),UNO_QUERY) , m_xPCF(m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.PopupMenuControllerFactory"))), UNO_QUERY) , m_xFrame(xFrame) , m_xdp(xFrame, UNO_QUERY) -- cgit