diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-06-26 14:28:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-06-26 18:13:10 +0200 |
| commit | b08292b918f264c4f012ef8c543062cb23ad3b7b (patch) | |
| tree | 7440515c823cf896ca31f9d5c03d41e612997d83 /framework/inc | |
| parent | 5d296183072dc7cfe7a9985c38388b56f37d873c (diff) | |
weld FixedImageControl
Change-Id: I13f3480794232a9c203ae047a4fcad372988b8b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97235
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/uielement/FixedImageToolbarController.hxx | 7 | ||||
| -rw-r--r-- | framework/inc/uielement/spinfieldtoolbarcontroller.hxx | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/framework/inc/uielement/FixedImageToolbarController.hxx b/framework/inc/uielement/FixedImageToolbarController.hxx index 2f10503e5343..66533fbc9cde 100644 --- a/framework/inc/uielement/FixedImageToolbarController.hxx +++ b/framework/inc/uielement/FixedImageToolbarController.hxx @@ -23,13 +23,14 @@ #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> -#include <vcl/fixed.hxx> +#include <vcl/vclptr.hxx> class ToolBox; -class FixedImage; namespace framework { +class FixedImageControl; + class FixedImageToolbarController final : public ComplexToolbarController { public: @@ -47,7 +48,7 @@ private: DECL_LINK(MiscOptionsChanged, LinkParamNone*, void); - VclPtr<FixedImage> m_pFixedImageControl; + VclPtr<FixedImageControl> m_pFixedImageControl; sal_Int16 m_eSymbolSize; }; } // namespace framework diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx index 3e2af6c78719..8085c68c1cbf 100644 --- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx +++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> -#include <vcl/event.hxx> #include <vcl/vclptr.hxx> class ToolBox; @@ -49,10 +48,6 @@ class SpinfieldToolbarController final : public ComplexToolbarController virtual void SAL_CALL dispose() override; // called from SpinfieldControl - void Up(); - void Down(); - void First(); - void Last(); void Modify(); void GetFocus(); void LoseFocus(); |