diff options
Diffstat (limited to 'include/svx/tbcontrl.hxx')
| -rw-r--r-- | include/svx/tbcontrl.hxx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index bf808381c6ac..dfa129a7c00b 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -136,7 +136,6 @@ #include <svx/strarray.hxx> #include <svx/svxdllapi.h> #include <com/sun/star/awt/FontDescriptor.hpp> -#include <svx/colorwindow.hxx> #include <svx/PaletteManager.hxx> #include <memory> @@ -204,8 +203,19 @@ friend class SfxStyleControllerItem_Impl; SVX_DLLPRIVATE SfxStyleFamily GetActFamily(); }; -typedef std::function<void(const OUString&, const NamedColor&)> ColorSelectFunction; +class BorderColorStatus +{ + Color maColor; + Color maTLBRColor; + Color maBLTRColor; +public: + BorderColorStatus(); + ~BorderColorStatus(); + bool statusChanged( const css::frame::FeatureStateEvent& rEvent ); + Color GetColor(); +}; +typedef std::function<void(const OUString&, const Color&)> ColorSelectFunction; class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl { std::unique_ptr<svx::ToolboxButtonColorUpdater> m_xBtnUpdater; @@ -213,7 +223,7 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl BorderColorStatus m_aBorderColorStatus; bool m_bSplitButton; ColorSelectFunction m_aColorSelectFunction; - DECL_LINK(SelectedHdl, const NamedColor&, void); + DECL_LINK(SelectedHdl, const Color&, void); public: SFX_DECL_TOOLBOX_CONTROL(); SvxColorToolBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rToolBox); |