diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-12-23 11:16:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-23 17:00:58 +0100 |
| commit | b7570a5f9d026f7cd6f064594bd7599fe36e9a14 (patch) | |
| tree | ba091454feae5ee8f9c9bf985e9ff46961493211 /include/svtools | |
| parent | sal_Char->char in ucb (diff) | |
| download | core-b7570a5f9d026f7cd6f064594bd7599fe36e9a14.tar.gz core-b7570a5f9d026f7cd6f064594bd7599fe36e9a14.zip | |
reorganize ToolbarUnoDispatcher to be useful for sidebar
Change-Id: If129d4832f04758705e121bff88ea7d2e45bf96b
Reviewed-on: https://gerrit.libreoffice.org/85755
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/generictoolboxcontroller.hxx | 47 |
1 files changed, 30 insertions, 17 deletions
diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx index 6b9c11cc3924..ddf8dc06cee8 100644 --- a/include/svtools/generictoolboxcontroller.hxx +++ b/include/svtools/generictoolboxcontroller.hxx @@ -24,33 +24,46 @@ #include <svtools/toolboxcontroller.hxx> #include <vcl/toolbox.hxx> +namespace weld +{ + class Toolbar; +} + namespace svt { class SVT_DLLPUBLIC GenericToolboxController final : public svt::ToolboxController { - public: - GenericToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const css::uno::Reference< css::frame::XFrame >& rFrame, - ToolBox* pToolBox, - sal_uInt16 nID, - const OUString& aCommand ); - virtual ~GenericToolboxController() override; +public: + GenericToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, + ToolBox* pToolBox, + sal_uInt16 nID, + const OUString& aCommand ); + + GenericToolboxController(const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, + weld::Toolbar& rToolbar, + const OUString& rCommand); + + virtual ~GenericToolboxController() override; + + // XComponent + virtual void SAL_CALL dispose() override; - // XComponent - virtual void SAL_CALL dispose() override; + // XToolbarController + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override; - // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override; + // XStatusListener + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override; - // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override; + DECL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, void*, void ); - DECL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, void*, void ); +private: + VclPtr<ToolBox> m_xToolbox; + sal_uInt16 m_nID; - private: - VclPtr<ToolBox> m_pToolbox; - sal_uInt16 m_nID; + weld::Toolbar* m_pToolbox; }; } |