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

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

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

4 files changed, 20 insertions, 27 deletions

diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 4fa00c008f30..376117cafc9a 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -378,9 +378,7 @@
 #define RID_SVXSTR_HYPH_SPECIAL                             (RID_SVX_START + 1232)
 #define RID_SVXSTR_NUM_MIN_WORDLEN                          (RID_SVX_START + 1233)
 #define RID_SVXSTR_GRAMMAR_AUTO                             (RID_SVX_START + 1234)
-#define RID_SVXSTR_LINGU_MODULES_EDIT                       (RID_SVX_START + 1235)
-#define RID_SVXSTR_LINGU_DICS_EDIT_DIC                      (RID_SVX_START + 1236)
-#define RID_SVXSTR_LINGU_OPTIONS_EDIT                       (RID_SVX_START + 1237)
+// There is a gap here because of removed strings
 
 #define RID_SVXSTR_CHG_MATH                                 (RID_SVX_START + 1238)
 #define RID_SVXSTR_CHG_WRITER                               (RID_SVX_START + 1239)
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index fd1cdd5dcdb8..29f30ace352c 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1088,14 +1088,6 @@ SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet )
     else
         m_pMoreDictsLink->Hide();
 
-    OUString sAccessibleNameModuleEdit(CUI_RES(RID_SVXSTR_LINGU_MODULES_EDIT));
-    OUString sAccessibleNameDicsEdit  (CUI_RES(RID_SVXSTR_LINGU_DICS_EDIT_DIC));
-    OUString sAccessibleNameOptionEdit(CUI_RES(RID_SVXSTR_LINGU_OPTIONS_EDIT));
-
-    m_pLinguModulesEditPB->SetAccessibleName(sAccessibleNameModuleEdit);
-    m_pLinguDicsEditPB->SetAccessibleName(sAccessibleNameDicsEdit);
-    m_pLinguOptionsEditPB->SetAccessibleName(sAccessibleNameOptionEdit);
-
     xProp = SvxGetLinguPropertySet();
     xDicList.set( SvxGetDictionaryList(), UNO_QUERY );
     if (xDicList.is())
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index 5621f89a9e9d..084f3a902de6 100644
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -83,17 +83,5 @@ String RID_SVXSTR_HYPH_SPECIAL
 {
     Text [ en-US ] = "Hyphenate special regions";
 };
-String RID_SVXSTR_LINGU_MODULES_EDIT
-{
-    Text [ en-US ] = "Edit Available language modules";
-};
-String RID_SVXSTR_LINGU_DICS_EDIT_DIC
-{
-    Text [ en-US ] = "Edit User-defined dictionaries";
-};
-String RID_SVXSTR_LINGU_OPTIONS_EDIT
-{
-    Text [ en-US ] = "Edit Options";
-};
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui
index ad7d57731e12..5034a5df4088 100644
--- a/cui/uiconfig/ui/optlingupage.ui
+++ b/cui/uiconfig/ui/optlingupage.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"/>
@@ -44,10 +44,10 @@
                       <object class="GtkLabel" id="lingumodulesft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">_Available language modules:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">lingumodules:border</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -77,6 +77,11 @@
                         <property name="receives_default">True</property>
                         <property name="valign">start</property>
                         <property name="use_underline">True</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="lingumodulesedit-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Edit Available language modules</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -104,10 +109,10 @@
                       <object class="GtkLabel" id="lingudictsft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">_User-defined dictionaries:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">lingudicts:border</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -157,6 +162,11 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="use_underline">True</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="lingudictsedit-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Edit User-defined dictionaries</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -205,10 +215,10 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">_Options:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">linguoptions:border</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -255,6 +265,11 @@
                         <property name="receives_default">True</property>
                         <property name="valign">start</property>
                         <property name="use_underline">True</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="linguoptionsedit-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Edit Options</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>