[Libreoffice-commits] core.git: 2 commits - extras/source svx/uiconfig

[Maxim Monastirsky]

 extras/source/glade/libreoffice-catalog.xml.in |    7 ++-----
 svx/uiconfig/ui/colorwindow.ui                 |    4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 9c818268767d6a1c1bc731ae30c45883bab987e7
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Thu Sep 18 09:50:00 2014 +0300

    Use svxcorelo-SvxColorValueSet instead
    
    Change-Id: Ib2ad71326d0ff45eae01a16d675c3d40e1ba1f2c

diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index d15eb42..8daa9b2 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -55,7 +55,7 @@
           </packing>
         </child>
         <child>
-          <object class="svxlo-SvxColorValueSet" id="colorset">
+          <object class="svxcorelo-SvxColorValueSet" id="colorset">
             <property name="width_request">200</property>
             <property name="height_request">150</property>
             <property name="visible">True</property>
@@ -93,7 +93,7 @@
           </packing>
         </child>
         <child>
-          <object class="svxlo-SvxColorValueSet" id="recent_colorset">
+          <object class="svxcorelo-SvxColorValueSet" id="recent_colorset">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
commit dca88d025f28cb1b438bc34c32d048d940025063
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Thu Sep 18 09:51:55 2014 +0300

    Revert "Add svxlo-SvxColorValueSet to the glade catalog"
    
    This reverts commit 9df22b4ac0f97346701d0284abc74499310e660f.

diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 31dd5ee..12ff8b4 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -364,10 +364,7 @@
     <glade-widget-class title="Document Info Preview" name="svtlo-ODocumentInfoPreview"
                         generic-name="Document Info Preview" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
-    <glade-widget-class title="SvxCoreColorValueSet" name="svxcorelo-SvxColorValueSet"
-                        generic-name="Set of Value Options" parent="GtkDrawingArea"
-                        icon-name="widget-gtk-drawingarea"/>
-    <glade-widget-class title="SvxColorValueSet" name="svxlo-SvxColorValueSet"
+    <glade-widget-class title="SvxColorValueSet" name="svxcorelo-SvxColorValueSet"
                         generic-name="Set of Value Options" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
     <glade-widget-class title="SwColumnValueSet" name="swuilo-ColumnValueSet"
@@ -694,7 +691,7 @@
     <glade-widget-class title="Open Document ListBox" name="dbulo-OpenDocumentListBox"
                         generic-name="Open Document ListBox" parent="GtkComboBox"
                         icon-name="widget-gtk-combobox"/>
-
+                        
     <glade-widget-class title="Fade Effect ListBox" name="sdlo-FadeEffectLB"
                         generic-name="Fade Effect ListBox" parent="GtkComboBox"
                         icon-name="widget-gtk-combobox"/>