diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-05 20:28:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-07 21:04:50 +0000 |
| commit | 64a708cba9b954afe3331f63c58218eb53b3d0ce (patch) | |
| tree | ddc1bea3b63f32a1c6d377c1d1dd7aee0803fb70 /sd/uiconfig | |
| parent | f01c49c4a89ecad2376fd0023625186e5cac642e (diff) | |
Revert "Reverts a commit series that cripple windows ci."
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>
Diffstat (limited to 'sd/uiconfig')
| -rw-r--r-- | sd/uiconfig/sdraw/ui/copydlg.ui | 4 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/customanimationeffecttab.ui | 2 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/sidebarslidebackground.ui | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/uiconfig/sdraw/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui index 2ae2610b38c5..ddadc3fdcd77 100644 --- a/sd/uiconfig/sdraw/ui/copydlg.ui +++ b/sd/uiconfig/sdraw/ui/copydlg.ui @@ -448,7 +448,7 @@ </packing> </child> <child> - <object class="svxlo-ColorLB" id="start"> + <object class="svxcorelo-SvxColorListBox" id="start"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -459,7 +459,7 @@ </packing> </child> <child> - <object class="svxlo-ColorLB" id="end"> + <object class="svxcorelo-SvxColorListBox" id="end"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> diff --git a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui index fffceb744ec9..0ae1fbcd335f 100644 --- a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui +++ b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui @@ -254,7 +254,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="dim_color_list"> + <object class="svxcorelo-SvxColorListBox" id="dim_color_list"> <property name="visible">True</property> <property name="can_focus">False</property> </object> diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui index 9b5d24a435e3..5025ede8429a 100644 --- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui +++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui @@ -67,7 +67,7 @@ </packing> </child> <child> - <object class="svxlo-ColorLB" id="fillattr"> + <object class="svxcorelo-SvxColorListBox" id="fillattr"> <property name="width_request">150</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -140,7 +140,7 @@ </packing> </child> <child> - <object class="svxlo-ColorLB" id="fillattr2"> + <object class="svxcorelo-SvxColorListBox" id="fillattr2"> <property name="width_request">150</property> <property name="visible">True</property> <property name="can_focus">False</property> |