diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-21 11:39:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-21 13:55:46 +0100 |
| commit | 08e633d777f1d2cf11a93ccb55f231d084f3220c (patch) | |
| tree | 19fa8e7bc840d42614a330251ac48f17fedd63f9 /include/svx/colorwindow.hxx | |
| parent | make gallery listview seem faster to populate (diff) | |
| download | core-08e633d777f1d2cf11a93ccb55f231d084f3220c.tar.gz core-08e633d777f1d2cf11a93ccb55f231d084f3220c.zip | |
Related: tdf#130035 let SvxLineEndWindow have a menubutton parent
Change-Id: Id658dc0ac88d98ade67bdeb233eca6c912a3b253
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87133
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svx/colorwindow.hxx')
| -rw-r--r-- | include/svx/colorwindow.hxx | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index 8a2f42751dfd..e87b60141160 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -22,6 +22,7 @@ #include <svtools/toolbarmenu.hxx> #include <rtl/ustring.hxx> +#include <svx/dlgctrl.hxx> #include <svx/SvxColorValueSet.hxx> #include <svx/Palette.hxx> #include <vcl/lstbox.hxx> @@ -109,34 +110,6 @@ public: class SvxColorToolBoxControl; -class SVX_DLLPUBLIC MenuOrToolMenuButton -{ -private: - // either - weld::MenuButton* m_pMenuButton; - // or - weld::Toolbar* m_pToolbar; - OString m_aIdent; - // or - SvxColorToolBoxControl* m_pControl; - VclPtr<ToolBox> m_xToolBox; - sal_uInt16 m_nId; -public: - MenuOrToolMenuButton(weld::MenuButton* pMenuButton); - MenuOrToolMenuButton(weld::Toolbar* pToolbar, const OString& rIdent); - MenuOrToolMenuButton(SvxColorToolBoxControl* pControl, ToolBox* pToolbar, sal_uInt16 nId); - ~MenuOrToolMenuButton(); - - MenuOrToolMenuButton(MenuOrToolMenuButton const &) = default; - MenuOrToolMenuButton(MenuOrToolMenuButton &&) = default; - MenuOrToolMenuButton & operator =(MenuOrToolMenuButton const &) = default; - MenuOrToolMenuButton & operator =(MenuOrToolMenuButton &&) = default; - - bool get_active() const; - void set_inactive() const; - weld::Widget* get_widget() const; -}; - class SVX_DLLPUBLIC ColorWindow final : public WeldToolbarPopup { private: |