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 /sc/source/ui/inc/condformatdlgentry.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 'sc/source/ui/inc/condformatdlgentry.hxx')
-rw-r--r-- | sc/source/ui/inc/condformatdlgentry.hxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index cba12245772f..f7d446ff474b 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -18,6 +18,7 @@ class ScIconSetFrmtDataEntry; class ScCondFormatDlg; +class SvxColorListBox; namespace condformat { @@ -172,8 +173,8 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry VclPtr<Edit> maEdMin; VclPtr<Edit> maEdMax; - VclPtr<ColorListBox> maLbColMin; - VclPtr<ColorListBox> maLbColMax; + VclPtr<SvxColorListBox> maLbColMin; + VclPtr<SvxColorListBox> maLbColMax; ScFormatEntry* createColorscaleEntry() const; @@ -206,9 +207,9 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry VclPtr<Edit> maEdMiddle; VclPtr<Edit> maEdMax; - VclPtr<ColorListBox> maLbColMin; - VclPtr<ColorListBox> maLbColMiddle; - VclPtr<ColorListBox> maLbColMax; + VclPtr<SvxColorListBox> maLbColMin; + VclPtr<SvxColorListBox> maLbColMiddle; + VclPtr<SvxColorListBox> maLbColMax; ScFormatEntry* createColorscaleEntry() const; |