unify color selectors

Note: this removes the use of auto-color from writer's asian text grid, because
its always invisible as far as I can see in practice.

Change-Id: Ie850790d740a4d56c43015e493e093678cef3b4e

5 files changed, 9 insertions, 21 deletions

diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui
index 96f4db0adac5..50be6e00d4d7 100644
--- a/sw/uiconfig/swriter/ui/columnpage.ui
+++ b/sw/uiconfig/swriter/ui/columnpage.ui
@@ -538,7 +538,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo-ColorListBox" id="colorlb">
+                  <object class="svxlo-SvxColorListBox" id="colorlb">
                     <property name="visible">True</property>
                     <property name="dropdown">True</property>
                     <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/footnoteareapage.ui b/sw/uiconfig/swriter/ui/footnoteareapage.ui
index adcfbdb9ef93..420d24127002 100644
--- a/sw/uiconfig/swriter/ui/footnoteareapage.ui
+++ b/sw/uiconfig/swriter/ui/footnoteareapage.ui
@@ -342,7 +342,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo-ColorListBox" id="color">
+                  <object class="svxlo-SvxColorListBox" id="color">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
diff --git a/sw/uiconfig/swriter/ui/optredlinepage.ui b/sw/uiconfig/swriter/ui/optredlinepage.ui
index 8f3fc93c0bc7..8d35c0419afd 100644
--- a/sw/uiconfig/swriter/ui/optredlinepage.ui
+++ b/sw/uiconfig/swriter/ui/optredlinepage.ui
@@ -85,7 +85,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo-ColorListBox" id="insertcolor">
+                  <object class="svxlo-SvxColorListBox" id="insertcolor">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
@@ -196,7 +196,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo-ColorListBox" id="deletedcolor">
+                  <object class="svxlo-SvxColorListBox" id="deletedcolor">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
@@ -307,7 +307,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo-ColorListBox" id="changedcolor">
+                  <object class="svxlo-SvxColorListBox" id="changedcolor">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
@@ -379,7 +379,7 @@
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">12</property>
                 <child>
-                  <object class="svtlo-ColorListBox" id="markcolor">
+                  <object class="svxlo-SvxColorListBox" id="markcolor">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
@@ -472,18 +472,6 @@
         <property name="top_attach">3</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkLabel" id="byauthor">
-        <property name="can_focus">False</property>
-        <property name="no_show_all">True</property>
-        <property name="label" translatable="yes">By author</property>
-        <property name="use_underline">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">4</property>
-      </packing>
-    </child>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <widgets>
diff --git a/sw/uiconfig/swriter/ui/pagestylespanel.ui b/sw/uiconfig/swriter/ui/pagestylespanel.ui
index 4246cdedd22c..a905ab333b70 100644
--- a/sw/uiconfig/swriter/ui/pagestylespanel.ui
+++ b/sw/uiconfig/swriter/ui/pagestylespanel.ui
@@ -171,7 +171,7 @@
           </packing>
         </child>
         <child>
-          <object class="svxlo-ColorLB" id="lbcolor">
+          <object class="svxlo-SvxColorListBox" id="lbcolor">
             <property name="width_request">150</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -184,7 +184,7 @@
           </packing>
         </child>
         <child>
-          <object class="svxlo-ColorLB" id="lbgradient">
+          <object class="svxlo-SvxColorListBox" id="lbgradient">
             <property name="width_request">150</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/textgridpage.ui b/sw/uiconfig/swriter/ui/textgridpage.ui
index d95343da6f12..70ecde4b9d86 100644
--- a/sw/uiconfig/swriter/ui/textgridpage.ui
+++ b/sw/uiconfig/swriter/ui/textgridpage.ui
@@ -476,7 +476,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo-ColorListBox" id="listLB_COLOR">
+                  <object class="svxlo-SvxColorListBox" id="listLB_COLOR">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>