diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-28 13:37:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-04 17:14:26 +0000 |
| commit | 43bc3031483d172eccd72c3804e2d4fc2ef37de4 (patch) | |
| tree | 991d98e8e61fae47ada28ba7a0b02e1d6c8e443f /cui/source/inc/chardlg.hxx | |
| parent | 44523738f094ff3987e85ea0c47b8c636bbe5786 (diff) | |
unify color selectors
Note: this removes the use of auto-color from writer's asian text grid, because
its always invisible as far as I can see in practice.
Change-Id: Ie850790d740a4d56c43015e493e093678cef3b4e
Diffstat (limited to 'cui/source/inc/chardlg.hxx')
| -rw-r--r-- | cui/source/inc/chardlg.hxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index bea73e4f253e..484897d93afe 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -23,6 +23,7 @@ #include <sfx2/tabdlg.hxx> #include <svx/fntctrl.hxx> #include <svx/checklbx.hxx> +#include <svx/colorbox.hxx> #include <svx/langbox.hxx> #include <vcl/layout.hxx> #include <memory> @@ -175,7 +176,7 @@ class SvxCharEffectsPage : public SvxCharBasePage private: static const sal_uInt16 pEffectsRanges[]; VclPtr<FixedText> m_pFontColorFT; - VclPtr<ColorListBox> m_pFontColorLB; + VclPtr<SvxColorListBox> m_pFontColorLB; VclPtr<FixedText> m_pEffectsFT; VclPtr<ListBox> m_pEffectsLB; @@ -190,13 +191,13 @@ private: VclPtr<ListBox> m_pOverlineLB; VclPtr<FixedText> m_pOverlineColorFT; - VclPtr<ColorListBox> m_pOverlineColorLB; + VclPtr<SvxColorListBox> m_pOverlineColorLB; VclPtr<ListBox> m_pStrikeoutLB; VclPtr<ListBox> m_pUnderlineLB; VclPtr<FixedText> m_pUnderlineColorFT; - VclPtr<ColorListBox> m_pUnderlineColorLB; + VclPtr<SvxColorListBox> m_pUnderlineColorLB; VclPtr<CheckBox> m_pIndividualWordsBtn; @@ -210,8 +211,6 @@ private: sal_uInt16 m_nHtmlMode; - OUString m_aTransparentColorName; - SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet& rSet ); void Initialize(); @@ -225,7 +224,7 @@ private: DECL_LINK(CbClickHdl_Impl, Button*, void); DECL_LINK(TristClickHdl_Impl, Button*, void); DECL_LINK(UpdatePreview_Impl, ListBox&, void); - DECL_LINK(ColorBoxSelectHdl_Impl, ListBox&, void); + DECL_LINK(ColorBoxSelectHdl_Impl, SvxColorListBox&, void); public: virtual ~SvxCharEffectsPage() override; |