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

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

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

4 files changed, 20 insertions, 45 deletions

diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src
index c9d18eb62391..63455740b5ab 100644
--- a/chart2/source/controller/dialogs/Strings.src
+++ b/chart2/source/controller/dialogs/Strings.src
@@ -94,15 +94,6 @@ String STR_PAGE_POSITION
     Text [ en-US ] = "Position" ;
 };
 
-String STR_BUTTON_UP
-{
-    Text [ en-US ] = "Up";
-};
-String STR_BUTTON_DOWN
-{
-    Text [ en-US ] = "Down";
-};
-
 String STR_PAGE_LAYOUT
 {
     Text [ en-US ] = "Layout";
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index c8808e1d41ae..9c8fe5f0074b 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -267,9 +267,6 @@ DataSourceTabPage::DataSourceTabPage(
     if( m_pLB_SERIES->First())
         m_pLB_SERIES->Select( m_pLB_SERIES->First());
     m_pLB_SERIES->GrabFocus();
-
-    m_pBTN_UP->SetAccessibleName(SCH_RESSTR(STR_BUTTON_UP));
-    m_pBTN_DOWN->SetAccessibleName(SCH_RESSTR(STR_BUTTON_DOWN));
 }
 
 DataSourceTabPage::~DataSourceTabPage()
diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc
index 950050ba228f..9ffe163e620d 100644
--- a/chart2/source/inc/Strings.hrc
+++ b/chart2/source/inc/Strings.hrc
@@ -265,11 +265,8 @@
 #define STR_TEXT_DIRECTION_RTL              (RID_APP_START + 279)
 #define STR_TEXT_DIRECTION_SUPER            (RID_APP_START + 280)
 
-#define STR_BUTTON_UP                       (RID_APP_START + 500)
-#define STR_BUTTON_DOWN                     (RID_APP_START + 501)
-
-// ids must not exceed RID_APP_START + 499
-// ids >= RID_APP_START + 500 are defined in glob.hrc
+// There is a gap here due to removed strings
+// RID_APP_START + 500 and RID_APP_START + 501 are removed
 
 // CHART_STRINGS_HRC
 #endif
diff --git a/chart2/uiconfig/ui/tp_DataSource.ui b/chart2/uiconfig/ui/tp_DataSource.ui
index 8de0320b0fc5..55918aaab42c 100644
--- a/chart2/uiconfig/ui/tp_DataSource.ui
+++ b/chart2/uiconfig/ui/tp_DataSource.ui
@@ -1,8 +1,8 @@
 <?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"/>
-  <!-- interface-requires LibreOffice 1.0 -->
+  <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="imageIMB_RANGE_CAT">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -25,8 +25,8 @@
       <object class="GtkLabel" id="FT_CAPTION_FOR_WIZARD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
         <property name="label" translatable="yes">Customize Data Ranges for Individual Data Series</property>
+        <property name="xalign">0</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -55,10 +55,10 @@
               <object class="GtkLabel" id="FT_SERIES">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">Data _series:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">LB_SERIES:border</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -102,8 +102,6 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -113,12 +111,15 @@
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
                     <property name="always_show_image">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="BTN_UP-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes">Up</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -134,8 +135,6 @@
                   <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>
@@ -144,12 +143,15 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="BTN_DOWN-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes">Down</property>
+                      </object>
+                    </child>
                   </object>
                   <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>
@@ -178,16 +180,14 @@
               <object class="GtkLabel" id="FT_ROLE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Data ranges:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">LB_ROLE:border</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -205,24 +205,20 @@
               <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_RANGE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">Ran_ge for %VALUETYPE</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">EDT_RANGE</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>
@@ -262,8 +258,6 @@
               <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>
@@ -275,10 +269,10 @@
                   <object class="GtkLabel" id="FT_CATEGORIES">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Categories</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">EDT_CATEGORIES</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -290,9 +284,9 @@
                   <object class="GtkLabel" id="FT_DATALABELS">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Data _labels</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -304,8 +298,6 @@
               <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>
@@ -345,8 +337,6 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">5</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
           </object>