diff options
Diffstat (limited to 'sc/source/ui/inc')
| -rw-r--r-- | sc/source/ui/inc/colorformat.hxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/inc/condformatdlgentry.hxx | 11 | ||||
| -rw-r--r-- | sc/source/ui/inc/opredlin.hxx | 9 | ||||
| -rw-r--r-- | sc/source/ui/inc/scendlg.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/inc/tpview.hxx | 3 |
5 files changed, 19 insertions, 16 deletions
diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index 682be33c87ad..8838418cfc18 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -19,6 +19,7 @@ struct ScDataBarFormatData; class ScDocument; +class SvxColorListBox; class ScDataBarSettingsDlg : public ModalDialog { @@ -26,9 +27,9 @@ private: VclPtr<OKButton> mpBtnOk; VclPtr<CancelButton> mpBtnCancel; - VclPtr<ColorListBox> mpLbPos; - VclPtr<ColorListBox> mpLbNeg; - VclPtr<ColorListBox> mpLbAxisCol; + VclPtr<SvxColorListBox> mpLbPos; + VclPtr<SvxColorListBox> mpLbNeg; + VclPtr<SvxColorListBox> mpLbAxisCol; VclPtr<ListBox> mpLbFillType; VclPtr<ListBox> mpLbTypeMin; @@ -43,7 +44,6 @@ private: VclPtr<CheckBox> mpCbOnlyBar; OUString maStrWarnSameValue; - OUString maCustomColor; SvNumberFormatter* mpNumberFormatter; ScDocument* mpDoc; 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; diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index a0a3e765c3be..69d1bfb31db4 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -36,11 +36,10 @@ class ScRedlineOptionsTabPage : public SfxTabPage { - VclPtr<ColorListBox> m_pContentColorLB; - VclPtr<ColorListBox> m_pRemoveColorLB; - VclPtr<ColorListBox> m_pInsertColorLB; - VclPtr<ColorListBox> m_pMoveColorLB; - OUString aAuthorStr; + VclPtr<SvxColorListBox> m_pContentColorLB; + VclPtr<SvxColorListBox> m_pRemoveColorLB; + VclPtr<SvxColorListBox> m_pInsertColorLB; + VclPtr<SvxColorListBox> m_pMoveColorLB; public: diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index e20073c17882..3d5ecf4ce7e5 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -29,6 +29,8 @@ enum class ScScenarioFlags; +class SvxColorListBox; + class ScNewScenarioDlg : public ModalDialog { public: @@ -45,7 +47,7 @@ private: VclPtr<Edit> m_pEdName; VclPtr<VclMultiLineEdit> m_pEdComment; VclPtr<CheckBox> m_pCbShowFrame; - VclPtr<ColorListBox> m_pLbColor; + VclPtr<SvxColorListBox> m_pLbColor; VclPtr<CheckBox> m_pCbTwoWay; VclPtr<CheckBox> m_pCbCopyAll; VclPtr<CheckBox> m_pCbProtect; diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 359be4889d81..480d82432442 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -28,13 +28,14 @@ #include <svx/strarray.hxx> class ScViewOptions; +class SvxColorListBox; class ScTpContentOptions : public SfxTabPage { friend class VclPtr<ScTpContentOptions>; VclPtr<ListBox> pGridLB; VclPtr<FixedText> pColorFT; - VclPtr<ColorListBox> pColorLB; + VclPtr<SvxColorListBox> pColorLB; VclPtr<CheckBox> pBreakCB; VclPtr<CheckBox> pGuideLineCB; |