Move accessibility relations to .ui files, Part 7: tdf#87026

By removing unnecessary variables/strings/funciton calls,
and making proper changes in the related .ui files.

Change-Id: I059bf02bc6ea29bf1b92d21f5a10a76548ecd1fc
Reviewed-on: https://gerrit.libreoffice.org/25973
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

2 files changed, 36 insertions, 14 deletions

diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index b3e48e268d95..076e447553ad 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -260,14 +260,6 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings* pBind, SfxChildWindow* pCW, vcl::Windo
     }
 
     UpdateColors();
-
-    OUString leftLabelName = m_pLeftFT->GetText(), rightLabelName = m_pRightFT->GetText();
-    m_pLeft2ED->SetAccessibleName(leftLabelName);
-    m_pLeft3ED->SetAccessibleName(leftLabelName);
-    m_pLeft4ED->SetAccessibleName(leftLabelName);
-    m_pRight2ED->SetAccessibleName(rightLabelName);
-    m_pRight3ED->SetAccessibleName(rightLabelName);
-    m_pRight4ED->SetAccessibleName(rightLabelName);
 }
 
 SvxRubyDialog::~SvxRubyDialog()
diff --git a/svx/uiconfig/ui/asianphoneticguidedialog.ui b/svx/uiconfig/ui/asianphoneticguidedialog.ui
index 882674328c93..63bc46615d7c 100644
--- a/svx/uiconfig/ui/asianphoneticguidedialog.ui
+++ b/svx/uiconfig/ui/asianphoneticguidedialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -86,7 +86,7 @@
                   <object class="GtkLabel" id="basetextft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Base text </property>
+                    <property name="label" translatable="yes">Base text</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -136,6 +136,11 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="Left2ED-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Base text</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -167,6 +172,11 @@
                           <object class="svxlo-RubyEdit" id="Right2ED">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="Right2ED-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Ruby text</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -177,6 +187,11 @@
                           <object class="svxlo-RubyEdit" id="Left3ED">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="Left3ED-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Base text</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -187,6 +202,11 @@
                           <object class="svxlo-RubyEdit" id="Right3ED">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="Right3ED-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Ruby text</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -197,6 +217,11 @@
                           <object class="svxlo-RubyEdit" id="Right4ED">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="Right4ED-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Ruby text</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -207,6 +232,11 @@
                           <object class="svxlo-RubyEdit" id="Left4ED">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="Left4ED-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Base text</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -235,10 +265,10 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Alignment:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">adjustlb</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -249,10 +279,10 @@
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Position:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">positionlb</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -263,10 +293,10 @@
                   <object class="GtkLabel" id="styleft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Character style for ruby text:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">stylelb</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -343,10 +373,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_top">6</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">Preview:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">preview</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="expand">False</property>