diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2020-08-12 23:36:52 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2020-08-14 17:03:41 +0200 |
| commit | c5301f215fec9016c3a75ff4a6a0c6c22f152718 (patch) | |
| tree | 7a4f147999967eeb161dbf4383ad19e20db5f4de /framework/inc | |
| parent | f3cb59c46398b3a0646b8b374d5626f715fa6884 (diff) | |
Replace MenuToolbarController with the usual approach for menu buttons
i.e. ResourceMenuController + GenericPopupToolbarController.
(Decl. of both isn't available in a header file, so they are instantiated
via the service manager for now. This is a bit weird for something from
the same module, but should not make any difference in practice.)
Change-Id: Ia3fc7ba82b0f6e1a43aa7b5e56e2cff7e039d877
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100725
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/uielement/generictoolbarcontroller.hxx | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx index eac6e8276b50..35934818ccb7 100644 --- a/framework/inc/uielement/generictoolbarcontroller.hxx +++ b/framework/inc/uielement/generictoolbarcontroller.hxx @@ -21,13 +21,8 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX #include <svtools/toolboxcontroller.hxx> -#include <com/sun/star/container/XIndexAccess.hpp> - -#include <tools/link.hxx> -#include <vcl/menu.hxx> #include <vcl/vclptr.hxx> -class PopupMenu; class ToolBox; namespace framework @@ -69,23 +64,6 @@ class GenericToolbarController final : public svt::ToolboxController OUString m_aEnumCommand; }; -class MenuToolbarController final : public svt::ToolboxController -{ - css::uno::Reference< css::container::XIndexAccess > m_xMenuDesc; - VclPtr<PopupMenu> pMenu; - css::uno::Reference< css::lang::XComponent > m_xMenuManager; - -public: - // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& ) override {} - // XComponent - virtual void SAL_CALL dispose() override; - // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArgs ) override; - // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override; -}; - } #endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX |