Related: fdo#67395 drop 'Preview' frame title

it's clear that it's a preview, move that string into its Accessible name for
those that can't see the preview

Change-Id: I684f451542f5300cc206c9ade7f3b130b1c3c876

4 files changed, 69 insertions, 126 deletions

diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 9e720c040567..a6b8c55ba294 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -785,43 +785,27 @@
       </packing>
     </child>
     <child>
-      <object class="GtkFrame" id="frame4">
+      <object class="GtkAlignment" id="alignment4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="top_padding">6</property>
+        <property name="left_padding">12</property>
         <child>
-          <object class="GtkAlignment" id="alignment4">
+          <object class="svxlo-SvxFontPrevWindow" id="preview">
+            <property name="height_request">100</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="top_padding">6</property>
-            <property name="left_padding">12</property>
-            <child>
-              <object class="svxlo-SvxFontPrevWindow" id="preview">
-                <property name="height_request">100</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="preview-atkobject">
+                <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
               </object>
             </child>
           </object>
         </child>
-        <child type="label">
-          <object class="GtkLabel" id="label19">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Preview</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">preview</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
       </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="pack_type">end</property>
         <property name="position">4</property>
       </packing>
     </child>
diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 42dbbe1dd48b..75c28eb7bdf7 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -638,41 +638,27 @@
       </packing>
     </child>
     <child>
-      <object class="GtkFrame" id="frame12">
+      <object class="GtkAlignment" id="alignment12">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="top_padding">6</property>
+        <property name="left_padding">12</property>
         <child>
-          <object class="GtkAlignment" id="alignment12">
+          <object class="svxlo-SvxFontPrevWindow" id="preview">
+            <property name="height_request">100</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="top_padding">6</property>
-            <property name="left_padding">12</property>
-            <child>
-              <object class="svxlo-SvxFontPrevWindow" id="preview">
-                <property name="height_request">100</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="preview-atkobject">
+                <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
               </object>
             </child>
           </object>
         </child>
-        <child type="label">
-          <object class="GtkLabel" id="label50">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Preview</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
       </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="pack_type">end</property>
         <property name="position">1</property>
       </packing>
     </child>
diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui
index 236f1a967bd1..0adf19264e14 100644
--- a/cui/uiconfig/ui/positionpage.ui
+++ b/cui/uiconfig/ui/positionpage.ui
@@ -490,43 +490,29 @@
       </packing>
     </child>
     <child>
-      <object class="GtkFrame" id="frame13">
+      <object class="GtkAlignment" id="alignment13">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="top_padding">6</property>
+        <property name="left_padding">12</property>
         <child>
-          <object class="GtkAlignment" id="alignment13">
+          <object class="svxlo-SvxFontPrevWindow" id="preview">
+            <property name="height_request">100</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="top_padding">6</property>
-            <property name="left_padding">12</property>
-            <child>
-              <object class="svxlo-SvxFontPrevWindow" id="preview">
-                <property name="height_request">100</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="preview-atkobject">
+                <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
               </object>
             </child>
           </object>
         </child>
-        <child type="label">
-          <object class="GtkLabel" id="label51">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Preview</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
       </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="pack_type">end</property>
         <property name="position">3</property>
       </packing>
     </child>
diff --git a/cui/uiconfig/ui/twolinespage.ui b/cui/uiconfig/ui/twolinespage.ui
index 4a4637928c5b..0f4fef5f1985 100644
--- a/cui/uiconfig/ui/twolinespage.ui
+++ b/cui/uiconfig/ui/twolinespage.ui
@@ -1,6 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkListStore" id="liststore2">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+      <!-- column-name gint1 -->
+      <column type="gint"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">(None)</col>
+        <col id="1">0</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">)</col>
+        <col id="1">1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">]</col>
+        <col id="1">2</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">&gt;</col>
+        <col id="1">3</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">}</col>
+        <col id="1">4</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Other Characters...</col>
+        <col id="1">5</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkBox" id="TwoLinesPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -148,41 +183,27 @@
       </packing>
     </child>
     <child>
-      <object class="GtkFrame" id="frame14">
+      <object class="GtkAlignment" id="alignment14">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="top_padding">6</property>
+        <property name="left_padding">12</property>
         <child>
-          <object class="GtkAlignment" id="alignment14">
+          <object class="svxlo-SvxFontPrevWindow" id="preview">
+            <property name="height_request">100</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="top_padding">6</property>
-            <property name="left_padding">12</property>
-            <child>
-              <object class="svxlo-SvxFontPrevWindow" id="preview">
-                <property name="height_request">100</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="preview-atkobject">
+                <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
               </object>
             </child>
           </object>
         </child>
-        <child type="label">
-          <object class="GtkLabel" id="label52">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Preview</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
       </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="pack_type">end</property>
         <property name="position">2</property>
       </packing>
     </child>
@@ -221,38 +242,4 @@
       </row>
     </data>
   </object>
-  <object class="GtkListStore" id="liststore2">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name gint1 -->
-      <column type="gint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">(None)</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">)</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">]</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">&gt;</col>
-        <col id="1">3</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">}</col>
-        <col id="1">4</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Other Characters...</col>
-        <col id="1">5</col>
-      </row>
-    </data>
-  </object>
 </interface>