[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - sw/uiconfig

[Michael Stahl]

 sw/uiconfig/swriter/ui/objectdialog.ui  |   20 +++-----------------
 sw/uiconfig/swriter/ui/picturedialog.ui |   20 +++-----------------
 2 files changed, 6 insertions(+), 34 deletions(-)

New commits:
commit 541e0098d2207dcc6e4053b2e2243de9a81d258c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jul 15 17:17:35 2014 +0200

    fdo#81302: Revert "sw: adapt object/picturedialog.ui to FillAttributes"
    
    This reverts commit 270fabec85f37b513d29e74cb66b38d5eae7cf80.
    
    Required by commit dc17dad5fd7509f191718df8690e5847ab87669a, which
    reverted the FillAttributes.
    
    Change-Id: I525636d1e99b9fd639ad52aa69380a9896c7752b
    (cherry picked from commit f899e508c35b6170bc11fc2eb4a74ec58d895625)
    Reviewed-on: https://gerrit.libreoffice.org/10339
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Zolnai Tamás <zolnaitamas2000 at gmail.com>
    Tested-by: Zolnai Tamás <zolnaitamas2000 at gmail.com>

diff --git a/sw/uiconfig/swriter/ui/objectdialog.ui b/sw/uiconfig/swriter/ui/objectdialog.ui
index cd56896..dc48bdf 100644
--- a/sw/uiconfig/swriter/ui/objectdialog.ui
+++ b/sw/uiconfig/swriter/ui/objectdialog.ui
@@ -160,10 +160,10 @@
               <placeholder/>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="area">
+              <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Area</property>
+                <property name="label" translatable="yes">Background</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -174,27 +174,13 @@
               <placeholder/>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="transparence">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transparency</property>
-              </object>
-              <packing>
-                <property name="position">6</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child type="tab">
               <object class="GtkLabel" id="macro">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Macro</property>
               </object>
               <packing>
-                <property name="position">7</property>
+                <property name="position">6</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
diff --git a/sw/uiconfig/swriter/ui/picturedialog.ui b/sw/uiconfig/swriter/ui/picturedialog.ui
index 5562076..71e3140 100644
--- a/sw/uiconfig/swriter/ui/picturedialog.ui
+++ b/sw/uiconfig/swriter/ui/picturedialog.ui
@@ -188,10 +188,10 @@
               <placeholder/>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="area">
+              <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Area</property>
+                <property name="label" translatable="yes">Background</property>
               </object>
               <packing>
                 <property name="position">7</property>
@@ -202,27 +202,13 @@
               <placeholder/>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="transparence">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transparency</property>
-              </object>
-              <packing>
-                <property name="position">8</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child type="tab">
               <object class="GtkLabel" id="macro">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Macro</property>
               </object>
               <packing>
-                <property name="position">9</property>
+                <property name="position">8</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>