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/inc | |
| 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/inc')
| -rw-r--r-- | framework/inc/services/modulemanager.hxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx index d50b0da116df..eb1b9f456f54 100644 --- a/framework/inc/services/modulemanager.hxx +++ b/framework/inc/services/modulemanager.hxx @@ -27,10 +27,10 @@ #include <boost/noncopyable.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> +#include <com/sun/star/frame/XModuleManager2.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/container/XContainerQuery.hpp> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase3.hxx> namespace com { namespace sun { namespace star { namespace lang { class XSingleServiceFactory; @@ -49,9 +49,10 @@ namespace framework implements the service com.sun.star.frame.ModuleManager */ class ModuleManager: - public cppu::WeakImplHelper4< - css::lang::XServiceInfo, css::frame::XModuleManager, - css::container::XNameReplace, css::container::XContainerQuery >, + public cppu::WeakImplHelper3< + css::lang::XServiceInfo, + css::frame::XModuleManager2, + css::container::XContainerQuery >, private ThreadHelpBase, private boost::noncopyable { //___________________________________________ |