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.

6 files changed, 30 insertions, 62 deletions

diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 444797ff9714..9482562f83a6 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -13,14 +13,9 @@
     <property name="can_focus">False</property>
     <property name="margin_right">6</property>
     <property name="xalign">0</property>
-    <property name="pixbuf">cmd/sc_square_unfilled.png</property>
+    <property name="pixbuf">cmd/sc_colorsettings.png</property>
     <property name="icon_size">1</property>
   </object>
-  <object class="GtkImage" id="none_icon">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_square_unfilled.png</property>
-  </object>
   <object class="GtkWindow" id="palette_popup_window">
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
@@ -30,6 +25,7 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">popup-menu</property>
     <property name="skip_pager_hint">True</property>
+    <property name="decorated">False</property>
     <property name="deletable">False</property>
     <child>
       <object class="GtkBox" id="box1">
@@ -37,41 +33,13 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkBox">
+          <object class="GtkButton" id="auto_color_button">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">6</property>
-            <property name="homogeneous">True</property>
-            <child>
-              <object class="GtkButton" id="auto_color_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="image">auto_icon</property>
-                <property name="relief">none</property>
-                <property name="xalign">0</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="none_color_button">
-                <property name="label" translatable="yes">None</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="image">none_icon</property>
-                <property name="relief">none</property>
-                <property name="xalign">0</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="image">auto_icon</property>
+            <property name="relief">none</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/svx/uiconfig/ui/docking3deffects.ui b/svx/uiconfig/ui/docking3deffects.ui
index fad6d1ca9d19..e3856ffbd3ca 100644
--- a/svx/uiconfig/ui/docking3deffects.ui
+++ b/svx/uiconfig/ui/docking3deffects.ui
@@ -1089,7 +1089,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-SvxColorListBox" id="ambientcolor">
+                      <object class="svxlo-ColorLB" id="ambientcolor">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
@@ -1250,7 +1250,7 @@
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svxlo-SvxColorListBox" id="lightcolor1">
+                          <object class="svxlo-ColorLB" id="lightcolor1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="valign">start</property>
@@ -1263,7 +1263,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-SvxColorListBox" id="lightcolor2">
+                          <object class="svxlo-ColorLB" id="lightcolor2">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="valign">start</property>
@@ -1276,7 +1276,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-SvxColorListBox" id="lightcolor3">
+                          <object class="svxlo-ColorLB" id="lightcolor3">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="valign">start</property>
@@ -1289,7 +1289,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-SvxColorListBox" id="lightcolor4">
+                          <object class="svxlo-ColorLB" id="lightcolor4">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="valign">start</property>
@@ -1302,7 +1302,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-SvxColorListBox" id="lightcolor5">
+                          <object class="svxlo-ColorLB" id="lightcolor5">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="valign">start</property>
@@ -1315,7 +1315,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-SvxColorListBox" id="lightcolor6">
+                          <object class="svxlo-ColorLB" id="lightcolor6">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="valign">start</property>
@@ -1328,7 +1328,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-SvxColorListBox" id="lightcolor7">
+                          <object class="svxlo-ColorLB" id="lightcolor7">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="valign">start</property>
@@ -1341,7 +1341,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-SvxColorListBox" id="lightcolor8">
+                          <object class="svxlo-ColorLB" id="lightcolor8">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="valign">start</property>
@@ -1721,7 +1721,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-SvxColorListBox" id="objcolor">
+                      <object class="svxlo-ColorLB" id="objcolor">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
@@ -1733,7 +1733,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-SvxColorListBox" id="illumcolor">
+                      <object class="svxlo-ColorLB" id="illumcolor">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
@@ -1856,7 +1856,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-SvxColorListBox" id="speccolor">
+                      <object class="svxlo-ColorLB" id="speccolor">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
diff --git a/svx/uiconfig/ui/dockingcolorreplace.ui b/svx/uiconfig/ui/dockingcolorreplace.ui
index 9b7e535c81a3..778c740f38bc 100644
--- a/svx/uiconfig/ui/dockingcolorreplace.ui
+++ b/svx/uiconfig/ui/dockingcolorreplace.ui
@@ -241,7 +241,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-SvxColorListBox" id="color1">
+                      <object class="svxlo-ColorLB" id="color1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -257,7 +257,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-SvxColorListBox" id="color2">
+                      <object class="svxlo-ColorLB" id="color2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -273,7 +273,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-SvxColorListBox" id="color3">
+                      <object class="svxlo-ColorLB" id="color3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -289,7 +289,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-SvxColorListBox" id="color4">
+                      <object class="svxlo-ColorLB" id="color4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -305,7 +305,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-SvxColorListBox" id="color5">
+                      <object class="svxlo-ColorLB" id="color5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
diff --git a/svx/uiconfig/ui/dockingfontwork.ui b/svx/uiconfig/ui/dockingfontwork.ui
index 01e74c377e79..0c729be1b10e 100644
--- a/svx/uiconfig/ui/dockingfontwork.ui
+++ b/svx/uiconfig/ui/dockingfontwork.ui
@@ -437,7 +437,7 @@
           </packing>
         </child>
         <child>
-          <object class="svxlo-SvxColorListBox" id="color">
+          <object class="svxlo-ColorLB" id="color">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="tooltip_text" translatable="yes">Shadow Color</property>
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 85a3122d68c6..e85fe45dfa20 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -100,7 +100,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxlo-SvxColorListBox" id="fillgrad1">
+                  <object class="svxlo-ColorLB" id="fillgrad1">
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_text" translatable="yes">Fill gradient from.</property>
@@ -144,7 +144,7 @@
               </packing>
             </child>
             <child>
-              <object class="svxlo-SvxColorListBox" id="fillgrad2">
+              <object class="svxlo-ColorLB" id="fillgrad2">
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
                 <property name="tooltip_text" translatable="yes">Fill gradient to.</property>
diff --git a/svx/uiconfig/ui/sidebarshadow.ui b/svx/uiconfig/ui/sidebarshadow.ui
index 356b6ff46933..0b2e8cf6d48b 100644
--- a/svx/uiconfig/ui/sidebarshadow.ui
+++ b/svx/uiconfig/ui/sidebarshadow.ui
@@ -184,7 +184,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxlo-SvxColorListBox" id="LB_SHADOW_COLOR">
+                  <object class="svxlo-ColorLB" id="LB_SHADOW_COLOR">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>