diff options
| author | Noel Grandin <noel@peralex.com> | 2012-09-04 14:56:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-05 14:56:19 +0200 |
| commit | 1c7a54e3a14ad932e68b9281420e6c469e5dd2e5 (patch) | |
| tree | 8d2d64a9536e738cc6cda4f0690993c98b658bdd /framework/source | |
| parent | 55aa40bcd6ae3116c63a0eac18056bcfd011f43a (diff) | |
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
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/lomenubar/FrameHelper.cxx | 4 | ||||
| -rw-r--r-- | framework/source/services/modulemanager.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
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 <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> +#include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/frame/FrameAction.hpp> #include <com/sun/star/frame/FrameActionEvent.hpp> @@ -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) diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index d5d4522eba90..04158c0532e9 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -180,7 +180,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , { throw css::lang::IllegalArgumentException( ::rtl::OUString("No properties given to replace part of module."), - static_cast< css::container::XNameAccess* >(this), + static_cast< cppu::OWeakObject * >(this), 2); } @@ -207,7 +207,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , { throw css::uno::RuntimeException( ::rtl::OUString("Was not able to get write access to the requested module entry inside configuration."), - static_cast< css::container::XNameAccess* >(this)); + static_cast< cppu::OWeakObject * >(this)); } ::comphelper::SequenceAsHashMap::const_iterator pProp; @@ -239,7 +239,7 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName) { throw css::uno::RuntimeException( ::rtl::OUString("Was not able to get write access to the requested module entry inside configuration."), - static_cast< css::container::XNameAccess* >(this)); + static_cast< cppu::OWeakObject * >(this)); } // convert it to seq< PropertyValue > |