diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-02-27 14:32:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-02-27 14:32:33 +0100 |
| commit | 1683fae27e9019731534190964491b88b68b7a6e (patch) | |
| tree | 3ffc321bcb73aa99ce9687a0dd1cc6122467a5fa /framework/inc/uielement | |
| parent | b100342d42a15a3aed79d6f23ecfd0b56e4a86bf (diff) | |
Use WeakImplHelper to implement MenuBarManager
Change-Id: I3a30bc86796a7ad24616cb11ae10b6886e09c1e9
Diffstat (limited to 'framework/inc/uielement')
| -rw-r--r-- | framework/inc/uielement/menubarmanager.hxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 040bb06d625e..7c363dc902e1 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -51,7 +51,7 @@ #include <vcl/accel.hxx> #include <vcl/timer.hxx> #include <toolkit/awt/vclxmenu.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <framework/addonsoptions.hxx> @@ -68,12 +68,13 @@ typedef std::unordered_map< OUString, PopupControllerEntry, OUStringHash > Popup class AddonMenu; class AddonPopupMenu; -class MenuBarManager : public css::frame::XStatusListener , - public css::frame::XFrameActionListener , - public css::ui::XUIConfigurationListener , - public css::lang::XComponent , - public css::awt::XSystemDependentMenuPeer , - public ::cppu::OWeakObject +class MenuBarManager: + public cppu::WeakImplHelper< + css::frame::XStatusListener, + css::frame::XFrameActionListener, + css::ui::XUIConfigurationListener, + css::lang::XComponent, + css::awt::XSystemDependentMenuPeer> { protected: MenuBarManager( @@ -96,11 +97,6 @@ class MenuBarManager : public css::frame::XStatusListener , virtual ~MenuBarManager() override; - // XInterface - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - // XComponent virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; |