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, 11 insertions, 37 deletions

diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index 1e417130effb..8b185d952de3 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -31,22 +31,8 @@
 
 #include <functional>
 
-class SVX_DLLPUBLIC BorderColorStatus
-{
-    Color maColor;
-    Color maTLBRColor;
-    Color maBLTRColor;
-public:
-    BorderColorStatus();
-    ~BorderColorStatus();
-    bool statusChanged( const css::frame::FeatureStateEvent& rEvent );
-    Color GetColor();
-};
-
+class BorderColorStatus;
 class Button;
-typedef std::function<void(const OUString&, const NamedColor&)> ColorSelectFunction;
-
-#define COL_NONE_COLOR    TRGB_COLORDATA(0x80, 0xFF, 0xFF, 0xFF)
 
 class SVX_DLLPUBLIC SvxColorWindow : public SfxPopupWindow
 {
@@ -57,49 +43,37 @@ private:
 
     VclPtr<ListBox>     mpPaletteListBox;
     VclPtr<PushButton>  mpButtonAutoColor;
-    VclPtr<PushButton>  mpButtonNoneColor;
     VclPtr<PushButton>  mpButtonPicker;
     VclPtr<FixedLine>   mpAutomaticSeparator;
     OUString            maCommand;
-    Link<const NamedColor&, void> maSelectedLink;
+    Link<const Color&, void> maSelectedLink;
 
     PaletteManager&     mrPaletteManager;
     BorderColorStatus&  mrBorderColorStatus;
 
-    ColorSelectFunction maColorSelectFunction;
+    std::function<void(const OUString&, const Color&)> maColorSelectFunction;
 
     DECL_LINK( SelectHdl, ValueSet*, void );
     DECL_LINK( SelectPaletteHdl, ListBox&, void);
     DECL_LINK( AutoColorClickHdl, Button*, void );
     DECL_LINK( OpenPickerClickHdl, Button*, void );
 
-    static bool SelectValueSetEntry(SvxColorValueSet* pColorSet, const Color& rColor);
-    static NamedColor GetSelectEntryColor(ValueSet* pColorSet);
-    NamedColor GetAutoColor() const;
-    NamedColor GetNoneColor() const;
-
 public:
-    SvxColorWindow(const OUString& rCommand,
-                   PaletteManager& rPaletteManager,
-                   BorderColorStatus& rBorderColorStatus,
-                   sal_uInt16 nSlotId,
-                   const css::uno::Reference< css::frame::XFrame >& rFrame,
-                   vcl::Window* pParentWindow,
-                   ColorSelectFunction const& rColorSelectFunction);
+    SvxColorWindow( const OUString& rCommand,
+                         PaletteManager& rPaletteManager,
+                         BorderColorStatus& rBorderColorStatus,
+                         sal_uInt16 nSlotId,
+                         const css::uno::Reference< css::frame::XFrame >& rFrame,
+                         vcl::Window* pParentWindow,
+                         std::function<void(const OUString&, const Color&)> const & maColorSelectFunction);
     virtual ~SvxColorWindow() override;
     virtual void        dispose() override;
-    void                ShowNoneButton();
     void                StartSelection();
-    void                SetNoSelection();
-    bool                IsNoSelection() const;
-    void                SelectEntry(const NamedColor& rColor);
-    void                SelectEntry(const Color& rColor);
-    NamedColor          GetSelectEntryColor() const;
 
     virtual void        KeyInput( const KeyEvent& rKEvt ) override;
     virtual void        statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 
-    void SetSelectedHdl( const Link<const NamedColor&, void>& rLink ) { maSelectedLink = rLink; }
+    void SetSelectedHdl( const Link<const Color&, void>& rLink ) { maSelectedLink = rLink; }
 };
 
 #endif