From 3498fd9fe905c2021fe1298769c8e2025c2d6f39 Mon Sep 17 00:00:00 2001
From: Muhammet Kara <muhammet.kara@pardus.org.tr>
Date: Wed, 1 Jun 2016 14:25:03 +0300
Subject: Remove SetAccessibleRelationLabeledBy calls tdf#87026
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .../controller/dialogs/tp_3D_SceneGeometry.cxx     |  2 --
 chart2/uiconfig/ui/tp_3D_SceneGeometry.ui          | 37 ++++++++++------------
 cui/source/tabpages/paragrph.cxx                   |  6 ----
 cui/source/tabpages/paragrph.hrc                   |  1 -
 cui/source/tabpages/paragrph.src                   |  4 ---
 cui/uiconfig/ui/textflowpage.ui                    | 26 +++++++++++----
 extensions/source/dbpilots/groupboxwiz.cxx         |  1 -
 .../sabpilot/ui/defaultfieldselectionpage.ui       |  8 ++++-
 sc/source/ui/dbgui/scuiasciiopt.cxx                |  3 --
 sc/uiconfig/scalc/ui/textimportcsv.ui              | 15 ++++++---
 10 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 93f17f3f2de2..ae6bfa5fdf2b 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -143,8 +143,6 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow
     {
         m_pCbxRightAngledAxes->Enable(false);
     }
-    m_pMFPerspective->SetAccessibleName(m_pCbxPerspective->GetText());
-    m_pMFPerspective->SetAccessibleRelationLabeledBy(m_pCbxPerspective);
 }
 
 ThreeD_SceneGeometry_TabPage::~ThreeD_SceneGeometry_TabPage()
diff --git a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
index d492804bc8a0..f89fc13a726f 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
@@ -1,6 +1,7 @@
 <?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"/>
   <object class="GtkAdjustment" id="adjustmentPERSPECTIVE">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
@@ -32,55 +33,48 @@
         <property name="left_attach">0</property>
         <property name="top_attach">0</property>
         <property name="width">2</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="FT_X_ROTATION">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
         <property name="label" translatable="yes">_X rotation</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">MTR_FLD_X_ROTATION:0degrees</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
         <property name="top_attach">1</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="FT_Y_ROTATION">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
         <property name="label" translatable="yes">_Y rotation</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">MTR_FLD_Y_ROTATION:0degrees</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
         <property name="top_attach">2</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="FT_Z_ROTATION">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
         <property name="label" translatable="yes">_Z rotation</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">MTR_FLD_Z_ROTATION:0degrees</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
         <property name="top_attach">3</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -92,12 +86,13 @@
         <property name="use_underline">True</property>
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
+        <accessibility>
+          <relation type="label-for" target="MTR_FLD_PERSPECTIVE:0%"/>
+        </accessibility>
       </object>
       <packing>
         <property name="left_attach">0</property>
         <property name="top_attach">4</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -106,12 +101,18 @@
         <property name="can_focus">False</property>
         <property name="invisible_char">•</property>
         <property name="adjustment">adjustmentPERSPECTIVE</property>
+        <accessibility>
+          <relation type="labelled-by" target="CBX_PERSPECTIVE"/>
+        </accessibility>
+        <child internal-child="accessible">
+          <object class="AtkObject" id="MTR_FLD_PERSPECTIVE:0%-atkobject">
+            <property name="AtkObject::accessible-name" translatable="yes">Perspective</property>
+          </object>
+        </child>
       </object>
       <packing>
         <property name="left_attach">1</property>
         <property name="top_attach">4</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -126,8 +127,6 @@
       <packing>
         <property name="left_attach">1</property>
         <property name="top_attach">3</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -140,8 +139,6 @@
       <packing>
         <property name="left_attach">1</property>
         <property name="top_attach">2</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -154,8 +151,6 @@
       <packing>
         <property name="left_attach">1</property>
         <property name="top_attach">1</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
   </object>
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>
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index eaccdc4e4a05..7a65327e624a 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -335,7 +335,6 @@ namespace dbp
 
         announceControls(*m_pDefSelYes, *m_pDefSelNo, *m_pDefSelection);
         m_pDefSelection->SetDropDownLineCount(10);
-        m_pDefSelection->SetAccessibleRelationLabeledBy( m_pDefSelYes );
         m_pDefSelection->SetStyle(WB_DROPDOWN);
     }
 
diff --git a/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui b/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui
index e443ce083a19..d06f0da30593 100644
--- a/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui
+++ b/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="DefaultFieldSelectionPage">
@@ -40,6 +40,9 @@
             <property name="xalign">0</property>
             <property name="active">True</property>
             <property name="draw_indicator">True</property>
+            <accessibility>
+              <relation type="label-for" target="defselectionfield"/>
+            </accessibility>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -51,6 +54,9 @@
           <object class="GtkComboBoxText" id="defselectionfield">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <accessibility>
+              <relation type="labelled-by" target="defaultselectionyes"/>
+            </accessibility>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index cc331b6376e5..3d14c9524d95 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -449,9 +449,6 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa
 
     mpTableBox->Execute( CSVCMD_NEWCELLTEXTS );
 
-    pEdOther->SetAccessibleName(pCkbOther->GetText());
-    pEdOther->SetAccessibleRelationLabeledBy(pCkbOther);
-
     if (meCall == SC_TEXTTOCOLUMNS)
     {
         pFtCharSet->Disable();
diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui b/sc/uiconfig/scalc/ui/textimportcsv.ui
index 15f475d796c4..6a19d661e4f4 100644
--- a/sc/uiconfig/scalc/ui/textimportcsv.ui
+++ b/sc/uiconfig/scalc/ui/textimportcsv.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"/>
@@ -107,10 +107,10 @@
                           <object class="GtkLabel" id="textcharset">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Ch_aracter set:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">charset</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -121,10 +121,10 @@
                           <object class="GtkLabel" id="textlanguage">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Language:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">language</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -135,10 +135,10 @@
                           <object class="GtkLabel" id="textfromrow">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">From ro_w:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">fromrow</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -398,6 +398,11 @@
                                         <accessibility>
                                           <relation type="labelled-by" target="other"/>
                                         </accessibility>
+                                        <child internal-child="accessible">
+                                          <object class="AtkObject" id="inputother-atkobject">
+                                            <property name="AtkObject::accessible-name" translatable="yes">Other</property>
+                                          </object>
+                                        </child>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
@@ -420,10 +425,10 @@
                                       <object class="GtkLabel" id="texttextdelimiter">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Te_xt delimiter:</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">textdelimiter</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">0</property>
-- 
cgit v1.2.3