Remove SetAccessibleRelationLabeledBy calls tdf#87026

And make proper changes in the related .ui files

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

4 files changed, 20 insertions, 17 deletions

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 4b9e7daeeb0e..295a39a1aebc 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1902,12 +1902,6 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( vcl::Window* pParent, const SfxI
     get(m_pWidowRowNo,"spinWidow");
     get(m_pWidowRowLabel,"labelWidow");
 
-    m_pApplyCollBox->SetAccessibleRelationLabeledBy(m_pApplyCollBtn);
-    m_pApplyCollBox->SetAccessibleName(CUI_RES(STR_PAGE_STYLE));
-
-    m_pOrphanRowNo->SetAccessibleRelationLabeledBy(m_pOrphanBox);
-    m_pWidowRowNo->SetAccessibleRelationLabeledBy(m_pWidowBox);
-
     // this page needs ExchangeSupport
     SetExchangeSupport();
 
diff --git a/cui/source/tabpages/paragrph.hrc b/cui/source/tabpages/paragrph.hrc
index 31694ed6cdbb..b59f21355bf8 100644
--- a/cui/source/tabpages/paragrph.hrc
+++ b/cui/source/tabpages/paragrph.hrc
@@ -22,7 +22,6 @@
 // StandardTabPage ----------------------------------------------------------
 
 #define STR_EXAMPLE                     5010
-#define STR_PAGE_STYLE                  5011
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src
index c24613414eb0..8c57940dc6b6 100644
--- a/cui/source/tabpages/paragrph.src
+++ b/cui/source/tabpages/paragrph.src
@@ -26,9 +26,5 @@ String STR_EXAMPLE
 {
     Text [ en-US ] = "Example" ;
 };
-String STR_PAGE_STYLE
-{
-    Text [ en-US ] = "Page Style" ;
-};
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/textflowpage.ui b/cui/uiconfig/ui/textflowpage.ui
index c11f30da5b9a..234fbb9a88ef 100644
--- a/cui/uiconfig/ui/textflowpage.ui
+++ b/cui/uiconfig/ui/textflowpage.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">
@@ -224,10 +224,10 @@
                   <object class="GtkLabel" id="labelType">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Type:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">comboBreakType</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -250,11 +250,11 @@
                   <object class="GtkLabel" id="labelPageNum">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
                     <property name="label" translatable="yes">Page _number:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">right</property>
                     <property name="mnemonic_widget">spinPageNumber</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">3</property>
@@ -265,11 +265,11 @@
                   <object class="GtkLabel" id="labelPosition">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
                     <property name="label" translatable="yes">Position:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">right</property>
                     <property name="mnemonic_widget">comboBreakPosition</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">3</property>
@@ -280,6 +280,14 @@
                   <object class="GtkComboBox" id="comboPageStyle">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="checkPageStyle"/>
+                    </accessibility>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="comboPageStyle-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes">Page Style</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -425,6 +433,9 @@
                     <property name="can_focus">True</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">adjustment1</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="checkOrphan"/>
+                    </accessibility>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -439,6 +450,9 @@
                     <property name="adjustment">adjustment1</property>
                     <property name="climb_rate">1</property>
                     <property name="numeric">True</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="checkWidow"/>
+                    </accessibility>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -449,8 +463,8 @@
                   <object class="GtkLabel" id="labelOrphan">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">lines</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -461,8 +475,8 @@
                   <object class="GtkLabel" id="labelWidow">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">lines</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>