diff options
| author | Noel Grandin <noel@peralex.com> | 2012-12-11 17:18:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2012-12-21 09:12:07 +0200 |
| commit | e93a0018871ebea4da1959c72c06f3c7f4dc7b27 (patch) | |
| tree | 3f9b5b2dcde5d428e182966ace4a641aafe231c4 /framework/inc/uifactory | |
| parent | ecae523d9603eaf7ff0acc98682576813e50c94a (diff) | |
fdo#46808, Adapt frame::PopupMenuControllerFactory UNO service to new style
Required creating a new merged interface.
The service interface is going to be shared by some other services,
which is why it's name is != the service name.
Change-Id: I9af3c27b367807147a0052fb6fa4e42eb1ad32de
Diffstat (limited to 'framework/inc/uifactory')
| -rw-r--r-- | framework/inc/uifactory/toolbarcontrollerfactory.hxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/framework/inc/uifactory/toolbarcontrollerfactory.hxx b/framework/inc/uifactory/toolbarcontrollerfactory.hxx index 1e989a770441..c750a44fb9d2 100644 --- a/framework/inc/uifactory/toolbarcontrollerfactory.hxx +++ b/framework/inc/uifactory/toolbarcontrollerfactory.hxx @@ -29,10 +29,9 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/frame/XUIControllerRegistration.hpp> +#include <com/sun/star/frame/XToolbarControllerFactory.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> namespace framework @@ -40,9 +39,8 @@ namespace framework class ConfigurationAccess_ControllerFactory; class ToolbarControllerFactory : protected ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. - public ::cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo, - com::sun::star::lang::XMultiComponentFactory, - com::sun::star::frame::XUIControllerRegistration> + public ::cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo, + com::sun::star::frame::XToolbarControllerFactory> { public: ToolbarControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); |