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>

1 files changed, 3 insertions, 1 deletions

diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index bbaaef6cad08..d52d9a7cbbbd 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -31,6 +31,7 @@
 #include <svtools/valueset.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/tabdlg.hxx>
+#include <svx/colorbox.hxx>
 #include <fmtclbl.hxx>
 #include <colex.hxx>
 #include <prcntfld.hxx>
@@ -105,7 +106,7 @@ class SwColumnPage : public SfxTabPage
     VclPtr<FixedText>      m_pLineWidthLbl;
     VclPtr<MetricField>    m_pLineWidthEdit;
     VclPtr<FixedText>      m_pLineColorLbl;
-    VclPtr<ColorListBox>   m_pLineColorDLB;
+    VclPtr<SvxColorListBox> m_pLineColorDLB;
     VclPtr<FixedText>      m_pLineHeightLbl;
     VclPtr<MetricField>    m_pLineHeightEdit;
     VclPtr<FixedText>      m_pLinePosLbl;
@@ -146,6 +147,7 @@ class SwColumnPage : public SfxTabPage
     DECL_LINK( Down, Button *, void );
     DECL_LINK( UpdateColMgr, Edit&, void );
     DECL_LINK( UpdateColMgrListBox, ListBox&, void );
+    DECL_LINK( UpdateColMgrColorBox, SvxColorListBox&, void );
     void Timeout();
 
     void            Update(MetricField *pInteractiveField);