Reverts a commit series that cripple windows ci.

Revert "SvxShadowTabPage::Construct was removed"
f9a2c1c12ecad833c63b894c89d6008907477eb5.
Revert "replace OColorPopup with SvxColorWindow"
f300754bb1c6a347c92bb9548be7a65237176542.
Revert "drop AutoColorInvalid/SID_ATTR_AUTO_COLOR_INVALID"
347c2c334589b18cc62af292674bb3df1dd54b71.
Revert "replace last ColorLB use with a listbox of colors"
604b35bf55351751a396e34dcca3f85e75860fd5.
Revert "simplify, its just a vector of colors"
351a97ce6bda3075677b59fa1387ba3d1ab17d7a.
Revert "replace user draw with an Image of the color"
df738e0f8ceedb4bad756960be14d9c41adc165d.
Revert "strip down to the used pieces"
commit 08d6cd788f2584ce10ab8fa10665245e953c59d9.
Revert "move now combined ColorLB to location of last user"
a19b18ad7c9eb0197c10e6d7e451ec4542e4bc9e.
Revert "fold ColorListBox and ColorLB together"
a989a0b1f2b425f05b58d0e44ce2de31c842ed65.
Revert "move ColorListBox beside sole thing that uses it"
760a198e697f3070a5e0e029e4eff7be220eb9cd.
Revert "extensions leaks out details of Color Selector, patch it up"
8bea644d6117a49405e6426dc97214220fc869d1.
Revert "inherit FillAttrLB from ListBox not ColorListBox"
d2ce812f1d3a7a2aad89ca0bd11948b63d2db7b0.
Revert "unify color selectors"
43bc3031483d172eccd72c3804e2d4fc2ef37de4.

1 files changed, 9 insertions, 6 deletions

diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 6705b1c5fe5b..1f66ee5ef7b5 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -75,7 +75,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMaskChildWindow : public SfxChildWindo
 class MaskData;
 class MaskSet;
 class ColorWindow;
-class SvxColorListBox;
 
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
 {
@@ -89,27 +88,28 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
     VclPtr<CheckBox>           m_pCbx1;
     VclPtr<MaskSet>            m_pQSet1;
     VclPtr<MetricField>        m_pSp1;
-    VclPtr<SvxColorListBox>    m_pLbColor1;
+    VclPtr<ColorLB>            m_pLbColor1;
 
     VclPtr<CheckBox>           m_pCbx2;
     VclPtr<MaskSet>            m_pQSet2;
     VclPtr<MetricField>        m_pSp2;
-    VclPtr<SvxColorListBox>    m_pLbColor2;
+    VclPtr<ColorLB>            m_pLbColor2;
 
     VclPtr<CheckBox>           m_pCbx3;
     VclPtr<MaskSet>            m_pQSet3;
     VclPtr<MetricField>        m_pSp3;
-    VclPtr<SvxColorListBox>    m_pLbColor3;
+    VclPtr<ColorLB>            m_pLbColor3;
 
     VclPtr<CheckBox>           m_pCbx4;
     VclPtr<MaskSet>            m_pQSet4;
     VclPtr<MetricField>        m_pSp4;
-    VclPtr<SvxColorListBox>    m_pLbColor4;
+    VclPtr<ColorLB>            m_pLbColor4;
 
     MaskData*           pData;
     VclPtr<CheckBox>           m_pCbxTrans;
-    VclPtr<SvxColorListBox>    m_pLbColorTrans;
+    VclPtr<ColorLB>            m_pLbColorTrans;
 
+    XColorListRef       pColLst;
     Color               aPipetteColor;
     SvxBmpMaskSelectItem aSelItem;
 
@@ -140,6 +140,9 @@ public:
     void                SetColor( const Color& rColor );
     void                PipetteClicked();
 
+    bool                NeedsColorList() const;
+    void                SetColorList( const XColorListRef &pColorList );
+
     void                SetExecState( bool bEnable );
 
     Graphic             Mask( const Graphic& rGraphic );