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/26018Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

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";

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()

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

chart2/uiconfig/ui/tp_DataSource.ui

 <?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>

include/sfx2/sfx.hrc

@@ -139,7 +139,7 @@
 #define STR_ERRUNOEVENTBINDUNG              (RID_SFX_START+119)
 #define STR_SHARED                          (RID_SFX_START+120)
 #define RID_XMLSEC_DOCUMENTSIGNED           (RID_SFX_START+121)
-#define STR_PASSWD                          (RID_SFX_START+122)
+// Here is a gap, STR_PASSWORD was removed  RID_SFX_START+122
 #define STR_PASSWD_EMPTY                    (RID_SFX_START+123)
 #define STR_PASSWD_MIN_LEN                  (RID_SFX_START+124)
 #define STR_NONCHECKEDOUT_DOCUMENT          (RID_SFX_START+125)

sc/source/ui/dbgui/tpsort.cxx

@@ -519,10 +519,6 @@ ScTabPageSortOptions::ScTabPageSortOptions( vcl::Window*             pParent,
     get(m_pLbLanguage, "language");
     Init();
     SetExchangeSupport();
-
-    m_pLbOutPos->SetAccessibleName(m_pBtnCopyResult->GetText());
-    m_pEdOutPos->SetAccessibleName(m_pBtnCopyResult->GetText());
-    m_pLbSortUser->SetAccessibleName(m_pBtnSortUser->GetText());
 }
 
 ScTabPageSortOptions::~ScTabPageSortOptions()

sc/uiconfig/scalc/ui/sortoptionspage.ui

 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <!-- interface-requires LibreOffice 1.0 -->
+  <requires lib="gtk+" version="3.0"/>
+  <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="SortOptionsPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -39,8 +40,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>
@@ -55,8 +54,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>
@@ -71,8 +68,6 @@
                   <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>
@@ -87,8 +82,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>
@@ -106,8 +99,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>
@@ -119,12 +110,15 @@
                       <relation type="labelled-by" target="copyresult"/>
                       <relation type="label-for" target="outareaed"/>
                     </accessibility>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="outarealb-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes">Copy sort results to:</property>
+                      </object>
+                    </child>
                   </object>
                   <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>
                 <child>
@@ -133,16 +127,18 @@
                     <property name="can_focus">True</property>
                     <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>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="outareaed-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes">Copy sort results to:</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">5</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -160,8 +156,6 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">6</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -173,12 +167,16 @@
                     <accessibility>
                       <relation type="labelled-by" target="sortuser"/>
                     </accessibility>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="sortuserlb-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes">Custom sort order</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">7</property>
                     <property name="width">2</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -193,8 +191,6 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">8</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -209,8 +205,6 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">8</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -221,8 +215,6 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">9</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -233,8 +225,6 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">9</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -307,8 +297,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>
@@ -325,8 +313,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>
               </object>

sfx2/source/appl/sfx.src

@@ -39,11 +39,6 @@ String STR_PASSWD_EMPTY
     Text [ en-US ] = "(The password can be empty)" ;
 };
 
-String STR_PASSWD
-{
-    Text [ en-US ] = "Password" ;
-};
-
 String STR_MODULENOTINSTALLED
 {
     Text [ en-US ] = "The action could not be executed. The %PRODUCTNAME program module needed for this action is currently not installed.";

sfx2/source/dialog/passwd.cxx

@@ -109,8 +109,6 @@ SfxPasswordDialog::SfxPasswordDialog(vcl::Window* pParent, const OUString* pGrou
 
     get(mpOKBtn, "ok");
 
-    mpPassword1ED->SetAccessibleName(SFX2_RESSTR(STR_PASSWD));
-
     Link<Edit&,void> aLink = LINK( this, SfxPasswordDialog, EditModifyHdl );
     mpPassword1ED->SetModifyHdl( aLink );
     mpPassword2ED->SetModifyHdl( aLink );

sfx2/uiconfig/ui/password.ui

 <?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="GtkDialog" id="PasswordDialog">
@@ -97,10 +97,10 @@
                           <object class="GtkLabel" id="userft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">User:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">usered</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -111,10 +111,10 @@
                           <object class="GtkLabel" id="pass1ft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Password:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">pass1ed</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -125,10 +125,10 @@
                           <object class="GtkLabel" id="confirm1ft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Confirm:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">confirm1ed</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -153,6 +153,11 @@
                             <property name="hexpand">True</property>
                             <property name="visibility">False</property>
                             <property name="invisible_char">●</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="pass1ed-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Password</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -215,10 +220,10 @@
                           <object class="GtkLabel" id="pass2ft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Password:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">pass2ed</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -229,10 +234,10 @@
                           <object class="GtkLabel" id="confirm2ft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Confirm:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">confirm2ed</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -290,8 +295,8 @@
               <object class="GtkLabel" id="minlenft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="xpad">6</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="expand">False</property>

svx/source/dialog/ctredlin.cxx

@@ -551,9 +551,6 @@ SvxTPFilter::SvxTPFilter( vcl::Window * pParent)
     get(m_pCbComment, "comment");
     get(m_pEdComment, "commentedit");
 
-    m_pLbAuthor->SetAccessibleName(m_pCbAuthor->GetText());
-    m_pEdComment->SetAccessibleName(m_pCbComment->GetText());
-
     m_pDfDate->SetShowDateCentury( true );
     m_pDfDate2->SetShowDateCentury( true );
 

sw/source/ui/chrdlg/break.cxx

@@ -136,8 +136,6 @@ SwBreakDlg::SwBreakDlg( vcl::Window *pParent, SwWrtShell &rS )
     get(m_pPageNumBox, "pagenumcb");
     get(m_pPageNumEdit, "pagenumsb");
 
-    m_pPageNumEdit->SetAccessibleName(m_pPageNumBox->GetText());
-
     Link<Button*,void> aLk = LINK(this,SwBreakDlg,ClickHdl);
     m_pPageBtn->SetClickHdl( aLk );
     m_pLineBtn->SetClickHdl( aLk );

sw/uiconfig/swriter/ui/insertbreak.ui

 <?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">
@@ -161,10 +161,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_top">6</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Style:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">stylelb</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -210,6 +210,11 @@
                         <accessibility>
                           <relation type="labelled-by" target="pagenumcb"/>
                         </accessibility>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="pagenumsb-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Change page number</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>