Move accessibility relations to .ui files tdf#87026

Change-Id: I2ce2c236d124d31aaacacb0c24ba52b3a70b489c
Reviewed-on: https://gerrit.libreoffice.org/25555
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

6 files changed, 78 insertions, 57 deletions

diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 66b3e11b9411..d79ed31a73b0 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -196,11 +196,6 @@ SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet )
     SetLimits(nMin, nMax);
     m_pUserEdit->SetValue(nValue);
 
-    m_pUserEdit->SetAccessibleName(m_pUserBtn->GetText());
-    m_pColumnsEdit->SetAccessibleName(m_pColumnsBtn->GetText());
-    m_pColumnsEdit->SetAccessibleRelationMemberOf(m_pColumnsBtn);
-    m_pBookModeChk->SetAccessibleRelationMemberOf(m_pColumnsBtn);
-
     const SfxPoolItem& rItem = mrSet.Get(mrSet.GetPool()->GetWhich(SID_ATTR_ZOOM));
 
     if (nullptr != dynamic_cast<const SvxZoomItem*>( &rItem))
diff --git a/cui/uiconfig/ui/zoomdialog.ui b/cui/uiconfig/ui/zoomdialog.ui
index d8223522ae52..5d5df219b7f5 100644
--- a/cui/uiconfig/ui/zoomdialog.ui
+++ b/cui/uiconfig/ui/zoomdialog.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"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -199,6 +199,11 @@
                                 <accessibility>
                                   <relation type="labelled-by" target="variable"/>
                                 </accessibility>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" id="zoomsb:0%-atkobject">
+                                    <property name="AtkObject::accessible-name" translatable="yes">Variable</property>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -320,7 +325,13 @@
                                 <property name="adjustment">adjustment1</property>
                                 <accessibility>
                                   <relation type="labelled-by" target="columns"/>
+                                  <relation type="member-of" target="columns"/>
                                 </accessibility>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" id="columnssb-atkobject">
+                                    <property name="AtkObject::accessible-name" translatable="yes">Columns</property>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -350,6 +361,7 @@
                                 <property name="draw_indicator">True</property>
                                 <accessibility>
                                   <relation type="labelled-by" target="columns"/>
+                                  <relation type="member-of" target="columns"/>
                                 </accessibility>
                               </object>
                             </child>
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 8cea39999609..f457b986b490 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -102,8 +102,6 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(vcl::Window *pParent, bool bEN,
         get(m_pPosChapterBox, "posdoccb");
         m_pPosChapterBox->SetClickHdl(LINK(this, SwEndNoteOptionPage, PosChapterHdl));
         get(m_pPosFT, "pos");
-        m_pPosPageBox->SetAccessibleRelationMemberOf(m_pPosFT);
-        m_pPosChapterBox->SetAccessibleRelationMemberOf(m_pPosFT);
         get(m_pContEdit, "conted");
         get(m_pContFromEdit, "contfromed");
     }
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index d6adf602324f..d5d1f8794c96 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -154,12 +154,6 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell)
     m_pTypDLB1->SetAccessibleName(m_pTypLbl->GetText());
     m_pTypDLB2->SetAccessibleName(m_pTypLbl->GetText());
     m_pTypDLB3->SetAccessibleName(m_pTypLbl->GetText());
-    m_pSortUp1RB->SetAccessibleRelationMemberOf(m_pKeyCB1);
-    m_pSortDn1RB->SetAccessibleRelationMemberOf(m_pKeyCB1);
-    m_pSortUp2RB->SetAccessibleRelationMemberOf(m_pKeyCB2);
-    m_pSortDn2RB->SetAccessibleRelationMemberOf(m_pKeyCB2);
-    m_pSortUp3RB->SetAccessibleRelationMemberOf(m_pKeyCB3);
-    m_pSortDn3RB->SetAccessibleRelationMemberOf(m_pKeyCB3);
 
     m_pDelimEdt->SetMaxTextLen( 1 );
     if(rSh.GetSelectionType() &
@@ -237,17 +231,6 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell)
         m_pColEdt2->SetMax(nMax);
         m_pColEdt3->SetMax(nMax);
     }
-
-    m_pDelimPB->SetAccessibleRelationMemberOf(m_pDelimFreeRB);
-
-    m_pColEdt1->SetAccessibleRelationMemberOf(m_pKeyCB1);
-    m_pTypDLB1->SetAccessibleRelationMemberOf(m_pKeyCB1);
-
-    m_pColEdt2->SetAccessibleRelationMemberOf(m_pKeyCB2);
-    m_pTypDLB2->SetAccessibleRelationMemberOf(m_pKeyCB2);
-
-    m_pColEdt3->SetAccessibleRelationMemberOf(m_pKeyCB3);
-    m_pTypDLB3->SetAccessibleRelationMemberOf(m_pKeyCB3);
 }
 
 SwSortDlg::~SwSortDlg()
diff --git a/sw/uiconfig/swriter/ui/footnotepage.ui b/sw/uiconfig/swriter/ui/footnotepage.ui
index b5a28a0621e0..96ce210ef410 100644
--- a/sw/uiconfig/swriter/ui/footnotepage.ui
+++ b/sw/uiconfig/swriter/ui/footnotepage.ui
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
+  <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
     <property name="upper">9999</property>
@@ -8,6 +10,23 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Per page</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Per chapter</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Per document</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkBox" id="FootnotePage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -36,8 +55,8 @@
                   <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Numbering</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -50,8 +69,8 @@
                   <object class="GtkLabel" id="label7">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Counting</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -64,8 +83,8 @@
                   <object class="GtkLabel" id="label8">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Before</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -78,8 +97,8 @@
                   <object class="GtkLabel" id="pos">
                     <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="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -92,8 +111,8 @@
                   <object class="GtkLabel" id="offset">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Start at</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -106,8 +125,8 @@
                   <object class="GtkLabel" id="label11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">After</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -125,6 +144,9 @@
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">posdoccb</property>
+                    <accessibility>
+                      <relation type="member-of" target="pos"/>
+                    </accessibility>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -142,6 +164,9 @@
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">pospagecb</property>
+                    <accessibility>
+                      <relation type="member-of" target="pos"/>
+                    </accessibility>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -293,8 +318,8 @@
                       <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">Paragraph</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -307,8 +332,8 @@
                       <object class="GtkLabel" id="pagestyleft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Page</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -385,8 +410,8 @@
                       <object class="GtkLabel" id="label15">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Text area</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -399,8 +424,8 @@
                       <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Footnote area</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -485,8 +510,8 @@
                   <object class="GtkLabel" id="label17">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">End of footnote</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -499,8 +524,8 @@
                   <object class="GtkLabel" id="label18">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Start of next page</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -563,23 +588,6 @@
       </packing>
     </child>
   </object>
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Per page</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Per chapter</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Per document</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <widgets>
       <widget name="prefix"/>
diff --git a/sw/uiconfig/swriter/ui/sortdialog.ui b/sw/uiconfig/swriter/ui/sortdialog.ui
index e659547b2ea4..c3eb3aa9bfe3 100644
--- a/sw/uiconfig/swriter/ui/sortdialog.ui
+++ b/sw/uiconfig/swriter/ui/sortdialog.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"/>
@@ -163,6 +163,9 @@
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">down1</property>
+                                <accessibility>
+                                  <relation type="member-of" target="key1"/>
+                                </accessibility>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -179,6 +182,9 @@
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">up1</property>
+                                <accessibility>
+                                  <relation type="member-of" target="key1"/>
+                                </accessibility>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -206,6 +212,9 @@
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">down2</property>
+                                <accessibility>
+                                  <relation type="member-of" target="key2"/>
+                                </accessibility>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -222,6 +231,9 @@
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">up2</property>
+                                <accessibility>
+                                  <relation type="member-of" target="key2"/>
+                                </accessibility>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -249,6 +261,9 @@
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">down3</property>
+                                <accessibility>
+                                  <relation type="member-of" target="key3"/>
+                                </accessibility>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -265,6 +280,9 @@
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">up3</property>
+                                <accessibility>
+                                  <relation type="member-of" target="key3"/>
+                                </accessibility>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -332,6 +350,7 @@
                             <property name="adjustment">adjustment1</property>
                             <accessibility>
                               <relation type="labelled-by" target="column"/>
+                              <relation type="member-of" target="key1"/>
                             </accessibility>
                           </object>
                           <packing>
@@ -348,6 +367,7 @@
                             <property name="adjustment">adjustment1</property>
                             <accessibility>
                               <relation type="labelled-by" target="column"/>
+                              <relation type="member-of" target="key2"/>
                             </accessibility>
                           </object>
                           <packing>
@@ -364,6 +384,7 @@
                             <property name="adjustment">adjustment1</property>
                             <accessibility>
                               <relation type="labelled-by" target="column"/>
+                              <relation type="member-of" target="key3"/>
                             </accessibility>
                           </object>
                           <packing>
@@ -380,6 +401,7 @@
                             <property name="entry_text_column">0</property>
                             <accessibility>
                               <relation type="labelled-by" target="keytype"/>
+                              <relation type="member-of" target="key1"/>
                             </accessibility>
                           </object>
                           <packing>
@@ -397,6 +419,7 @@
                             <property name="button_sensitivity">off</property>
                             <accessibility>
                               <relation type="labelled-by" target="keytype"/>
+                              <relation type="member-of" target="key2"/>
                             </accessibility>
                           </object>
                           <packing>
@@ -412,6 +435,7 @@
                             <property name="hexpand">True</property>
                             <accessibility>
                               <relation type="labelled-by" target="keytype"/>
+                              <relation type="member-of" target="key3"/>
                             </accessibility>
                           </object>
                           <packing>
@@ -430,8 +454,8 @@
                   <object class="GtkLabel" id="1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0.56000000238418579</property>
                     <property name="label" translatable="yes">Sort Criteria</property>
+                    <property name="xalign">0.56000000238418579</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -605,6 +629,7 @@
                                     <property name="receives_default">True</property>
                                     <accessibility>
                                       <relation type="labelled-by" target="character"/>
+                                      <relation type="member-of" target="character"/>
                                     </accessibility>
                                   </object>
                                   <packing>