diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-11 13:02:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-13 16:16:24 +0200 |
| commit | 226fcda0a888c4959b1f895de31856f1624f04ee (patch) | |
| tree | 6c13e9ff0231f9f3fc744884937e3849b641773e /include/svx | |
| parent | b2e5f9ead2bb7f2979afe4ba13e3950e8a3cc278 (diff) | |
weld ConditionalFormattingDialog
Change-Id: I87c03555c5555b12a1be997e368a96d9b07d2b63
Reviewed-on: https://gerrit.libreoffice.org/80689
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/colorwindow.hxx | 21 | ||||
| -rw-r--r-- | include/svx/fntctrl.hxx | 6 |
2 files changed, 21 insertions, 6 deletions
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index 183a29d231ba..4656f3d37af7 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -110,6 +110,23 @@ public: void SetSelectedHdl( const Link<const NamedColor&, void>& rLink ) { maSelectedLink = rLink; } }; +class SVX_DLLPUBLIC MenuOrToolMenuButton +{ +private: + // either + weld::MenuButton* m_pMenuButton; + // or + weld::Toolbar* m_pToolbar; + OString m_aIdent; +public: + MenuOrToolMenuButton(weld::MenuButton* pMenuButton); + MenuOrToolMenuButton(weld::Toolbar* pToolbar, const OString& rIdent); + + bool get_active() const; + void set_active(bool bActive) const; + weld::Widget* get_widget() const; +}; + class SVX_DLLPUBLIC ColorWindow : public svtools::ToolbarPopupBase { private: @@ -117,7 +134,7 @@ private: const sal_uInt16 theSlotId; weld::Window* const mpParentWindow; - weld::MenuButton* mpMenuButton; + MenuOrToolMenuButton maMenuButton; std::shared_ptr<PaletteManager> mxPaletteManager; ColorStatus& mrColorStatus; ColorSelectFunction const maColorSelectFunction; @@ -148,7 +165,7 @@ public: ColorStatus& rColorStatus, sal_uInt16 nSlotId, const css::uno::Reference< css::frame::XFrame >& rFrame, - weld::Window* pParentWindow, weld::MenuButton* pMenuButton, + weld::Window* pParentWindow, const MenuOrToolMenuButton &rMenuButton, bool bInterimBuilder, ColorSelectFunction const& rColorSelectFunction); weld::Container* GetWidget() { return mxTopLevel.get(); } diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index d07d60edb62f..5332c98ed52e 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -20,12 +20,10 @@ #define INCLUDED_SVX_FNTCTRL_HXX #include <memory> -#include <vcl/customweld.hxx> -#include <vcl/window.hxx> #include <editeng/svxfont.hxx> -#include <svx/svxdllapi.h> - #include <rtl/ustring.hxx> +#include <svx/svxdllapi.h> +#include <vcl/customweld.hxx> class SfxItemSet; class FontPrevWin_Impl; |