move SetAccessibleRelationLabeledBy relations into .ui and out of code

Change-Id: Ieb43e08519b72d4baebd5d004e4c9fd60daa40d4

2 files changed, 20 insertions, 19 deletions

diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 78d04ac16a0d..d458597a3013 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -530,11 +530,8 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window*             pParent,
     Init();
     SetExchangeSupport();
 
-    m_pLbOutPos->SetAccessibleRelationLabeledBy(m_pBtnCopyResult);
     m_pLbOutPos->SetAccessibleName(m_pBtnCopyResult->GetText());
-    m_pEdOutPos->SetAccessibleRelationLabeledBy(m_pBtnCopyResult);
     m_pEdOutPos->SetAccessibleName(m_pBtnCopyResult->GetText());
-    m_pLbSortUser->SetAccessibleRelationLabeledBy(m_pBtnSortUser);
     m_pLbSortUser->SetAccessibleName(m_pBtnSortUser->GetText());
 }
 
diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index ded61ac0dd24..0276e2903718 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -20,11 +20,9 @@
             <child>
               <object class="GtkCheckButton" id="case">
                 <property name="label" translatable="yes">Case _sensitive</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
@@ -39,11 +37,9 @@
             <child>
               <object class="GtkCheckButton" id="header">
                 <property name="label" translatable="yes">Range contains...</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
               </object>
@@ -57,11 +53,9 @@
             <child>
               <object class="GtkCheckButton" id="formats">
                 <property name="label" translatable="yes">Include formats</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
               </object>
@@ -75,11 +69,9 @@
             <child>
               <object class="GtkCheckButton" id="naturalsort">
                 <property name="label" translatable="yes">Enable natural sort</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
               </object>
@@ -93,13 +85,14 @@
             <child>
               <object class="GtkCheckButton" id="copyresult">
                 <property name="label" translatable="yes">Copy sort results to:</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
+                <accessibility>
+                  <relation type="label-for" target="outarealb"/>
+                </accessibility>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -113,6 +106,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_left">20</property>
+                <accessibility>
+                  <relation type="labelled-by" target="copyresult"/>
+                  <relation type="label-for" target="outareaed"/>
+                </accessibility>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -128,6 +125,9 @@
                 <property name="hexpand">True</property>
                 <property name="invisible_char">•</property>
                 <property name="invisible_char_set">True</property>
+                <accessibility>
+                  <relation type="labelled-by" target="outarealb"/>
+                </accessibility>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -139,13 +139,14 @@
             <child>
               <object class="GtkCheckButton" id="sortuser">
                 <property name="label" translatable="yes">Custom sort order</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
+                <accessibility>
+                  <relation type="label-for" target="sortuserlb"/>
+                </accessibility>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -159,6 +160,9 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_left">20</property>
+                <accessibility>
+                  <relation type="labelled-by" target="sortuser"/>
+                </accessibility>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -173,6 +177,8 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes">Language</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">language</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -187,6 +193,8 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes">Options</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">algorithmlb</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -264,11 +272,9 @@
                 <child>
                   <object class="GtkRadioButton" id="topdown">
                     <property name="label" translatable="yes">_Top to bottom (sort rows)</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="active">True</property>
@@ -285,11 +291,9 @@
                 <child>
                   <object class="GtkRadioButton" id="leftright">
                     <property name="label" translatable="yes">L_eft to right (sort columns)</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>