Related: tdf#140387 give toolbuttons a11y names

Change-Id: I046957afaf89e3f88cde4c2a3cffa470af657175
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110939
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

4 files changed, 17 insertions, 15 deletions

diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx
index f7e0a8df7b7e..91d95d69f264 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -119,17 +119,7 @@ void DeckTitleBar::SetCloserVisible (const bool bIsCloserVisible)
 
     mbIsCloserVisible = bIsCloserVisible;
 
-    if (mbIsCloserVisible)
-    {
-        mxToolBox->set_item_visible("button", true);
-        mxToolBox->set_item_icon_name("button", "sfx2/res/closedoc.png");
-        mxToolBox->set_item_tooltip_text("button",
-                                    SfxResId(SFX_STR_SIDEBAR_CLOSE_DECK));
-    }
-    else
-    {
-        mxToolBox->set_item_visible("button", false);
-    }
+    mxToolBox->set_item_visible("button", mbIsCloserVisible);
 }
 
 void DeckTitleBar::HandleToolBoxItemClick()
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index a9ddbc79fcb5..7f2ff3214722 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -109,8 +109,6 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString& rsCommandName,
             *mxToolBox, *m_xBuilder, msMoreOptionsCommand, rxFrame, rxController, true);
 
     mxToolBox->set_item_visible(msIdent, true);
-    mxToolBox->set_item_icon_name(msIdent, "sfx2/res/symphony/morebutton.png");
-    mxToolBox->set_item_tooltip_text(msIdent, SfxResId(SFX_STR_SIDEBAR_MORE_OPTIONS));
 }
 
 void PanelTitleBar::HandleToolBoxItemClick()
diff --git a/sfx2/uiconfig/ui/decktitlebar.ui b/sfx2/uiconfig/ui/decktitlebar.ui
index 68ecdc6469be..bbfcba7bf69b 100644
--- a/sfx2/uiconfig/ui/decktitlebar.ui
+++ b/sfx2/uiconfig/ui/decktitlebar.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="sfx">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkBox" id="DeckTitleBar">
@@ -61,7 +61,14 @@
           <object class="GtkToolButton" id="button">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
+            <property name="tooltip-text" translatable="yes" context="decktitlebar|SFX_STR_SIDEBAR_CLOSE_DECK">Close Sidebar Deck</property>
             <property name="use-underline">True</property>
+            <property name="icon-name">sfx2/res/closedoc.png</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="button-atkobject">
+                <property name="AtkObject::accessible-name" translatable="yes" context="decktitlebar|SFX_STR_SIDEBAR_CLOSE_DECK">Close Sidebar Deck</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/sfx2/uiconfig/ui/paneltitlebar.ui b/sfx2/uiconfig/ui/paneltitlebar.ui
index 6fd621856b82..2e352bf21a4f 100644
--- a/sfx2/uiconfig/ui/paneltitlebar.ui
+++ b/sfx2/uiconfig/ui/paneltitlebar.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="sfx">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkBox" id="PanelTitleBar">
@@ -68,7 +68,14 @@
           <object class="GtkToolButton" id="button">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
+            <property name="tooltip-text" translatable="yes" context="paneltitlebar|SFX_STR_SIDEBAR_MORE_OPTIONS">More Options</property>
             <property name="use-underline">True</property>
+            <property name="icon-name">sfx2/res/symphony/morebutton.png</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="button-atkobject">
+                <property name="AtkObject::accessible-name" translatable="yes" context="paneltitlebar|SFX_STR_SIDEBAR_MORE_OPTIONS">More Options</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>