From 64a708cba9b954afe3331f63c58218eb53b3d0ce Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sat, 5 Nov 2016 20:28:27 +0000
Subject: Revert "Reverts a commit series that cripple windows ci."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 sw/uiconfig/swriter/ui/columnpage.ui       |  2 +-
 sw/uiconfig/swriter/ui/footnoteareapage.ui |  2 +-
 sw/uiconfig/swriter/ui/optredlinepage.ui   | 20 ++++----------------
 sw/uiconfig/swriter/ui/pagestylespanel.ui  |  4 ++--
 sw/uiconfig/swriter/ui/textgridpage.ui     |  2 +-
 5 files changed, 9 insertions(+), 21 deletions(-)

(limited to 'sw/uiconfig/swriter')

diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui
index 96f4db0adac5..9ff9a5f8bf67 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="svxcorelo-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..ba212099e4a4 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="svxcorelo-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..9febbd1447a1 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="svxcorelo-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="svxcorelo-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="svxcorelo-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="svxcorelo-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..a9f0817b6d4c 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="svxcorelo-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="svxcorelo-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..a0f575fa39f6 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="svxcorelo-SvxColorListBox" id="listLB_COLOR">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-- 
cgit