diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-07 12:37:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-07 16:43:01 +0200 |
| commit | 5744597e4d1df2cd9a739f249dbbcae7214a4e23 (patch) | |
| tree | f7df4ea2f8bb6369928903e0d2661e1f2b4d6e3c /include | |
| parent | 2a73c9e04ba9379c0561a7e8d531b5633c46ec52 (diff) | |
weld SvxCharEffectsPage
Change-Id: I067b7a8c93e997fd554558f334a2968bf27965c6
Reviewed-on: https://gerrit.libreoffice.org/60147
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/colorbox.hxx | 5 | ||||
| -rw-r--r-- | include/svx/colorwindow.hxx | 1 | ||||
| -rw-r--r-- | include/svx/fntctrl.hxx | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx index 9f3648e4a472..cefeec018826 100644 --- a/include/svx/colorbox.hxx +++ b/include/svx/colorbox.hxx @@ -101,6 +101,8 @@ private: Color m_aAutoDisplayColor; Color m_aSaveColor; NamedColor m_aSelectedColor; + sal_uInt16 m_nSlotId; + bool m_bShowNoneButton; bool m_bInterimBuilder; std::shared_ptr<PaletteManager> m_xPaletteManager; BorderColorStatus m_aBorderColorStatus; @@ -118,6 +120,8 @@ public: m_aSelectedLink = rLink; } + void SetSlotId(sal_uInt16 nSlotId, bool bShowNoneButton = false); + Color const & GetSelectEntryColor() const { return m_aSelectedColor.first; } NamedColor const & GetSelectedEntry() const { return m_aSelectedColor; } @@ -133,6 +137,7 @@ public: bool IsValueChangedFromSaved() const { return m_aSaveColor != GetSelectEntryColor(); } void set_sensitive(bool sensitive) { m_xButton->set_sensitive(sensitive); } + void hide() { m_xButton->hide(); } }; /** A wrapper for SvxColorListBox. */ diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index 42493890db02..02f77a979f34 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -152,6 +152,7 @@ public: ColorSelectFunction const& rColorSelectFunction); weld::Container* GetWidget() { return mxTopLevel.get(); } virtual ~ColorWindow() override; + void ShowNoneButton(); void SetNoSelection(); bool IsNoSelection() const; void SelectEntry(const NamedColor& rColor); diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index 320b49dc00e7..518c392e805b 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -105,12 +105,13 @@ public: virtual void StyleUpdated() override; - // for reasons of efficiency not const SvxFont& GetFont(); const SvxFont& GetFont() const; SvxFont& GetCJKFont(); SvxFont& GetCTLFont(); void SetBackColor( const Color& rColor ); + void SetTextLineColor(const Color& rColor); + void SetOverlineColor(const Color& rColor); void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; bool IsTwoLines() const; |