diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-11-05 20:28:27 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-07 21:04:50 +0000 |
commit | 64a708cba9b954afe3331f63c58218eb53b3d0ce (patch) | |
tree | ddc1bea3b63f32a1c6d377c1d1dd7aee0803fb70 /sc/source/ui/inc/scendlg.hxx | |
parent | f01c49c4a89ecad2376fd0023625186e5cac642e (diff) |
Revert "Reverts a commit series that cripple windows ci."
with addition of...
- svxlo-SvxColorListBox
+ svxcorelo-SvxColorListBox
This reverts commit db380aab1063e8a5e40111c40ee9f7921aa82601.
Change-Id: I3af7aa0abb1a430bce64188244404fcbd480b128
Reviewed-on: https://gerrit.libreoffice.org/30598
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/inc/scendlg.hxx')
-rw-r--r-- | sc/source/ui/inc/scendlg.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
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; |