diff options
| author | Niklas Johansson <sleeping.pillow@gmail.com> | 2015-05-05 13:52:15 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-07 13:58:18 +0000 |
| commit | b4d7f8248496610a508b8edbcd57b9875e68bd81 (patch) | |
| tree | d826342026ddd8d90bb257a9018d079fdece84ee | |
| parent | 0fc79344ce5e057f7c2258a0fe16374fe510745f (diff) | |
tdf#90994 The accessible name should not contain the accessible role
The accessible role (PANEL) is added as a prefix to the title bar
in the sidebar. That is redundant and can even make things confusing
for the users of screen-readers.
Change-Id: I743defa0b1b9f3f278d0cabc7196054796fb3c47
Reviewed-on: https://gerrit.libreoffice.org/15636
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sfx2/source/sidebar/PanelTitleBar.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/sidebar/PanelTitleBar.hxx | 1 | ||||
| -rw-r--r-- | sfx2/source/sidebar/Sidebar.hrc | 1 | ||||
| -rw-r--r-- | sfx2/source/sidebar/Sidebar.src | 4 |
4 files changed, 3 insertions, 11 deletions
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index f526c0250055..8a4313e7cb55 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -48,8 +48,7 @@ PanelTitleBar::PanelTitleBar ( mpPanel(pPanel), mnMenuItemIndex(1), mxFrame(), - msMoreOptionsCommand(), - msAccessibleNamePrefix(SFX2_RESSTR(SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX)) + msMoreOptionsCommand() { OSL_ASSERT(mpPanel != nullptr); @@ -168,9 +167,8 @@ void PanelTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) Reference<accessibility::XAccessible> PanelTitleBar::CreateAccessible() { - const ::rtl::OUString sAccessibleName(msAccessibleNamePrefix + msTitle); - SetAccessibleName(sAccessibleName); - SetAccessibleDescription(sAccessibleName); + SetAccessibleName(msTitle); + SetAccessibleDescription(msTitle); return TitleBar::CreateAccessible(); } diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx b/sfx2/source/sidebar/PanelTitleBar.hxx index ede039f863dd..3a00cf780f1e 100644 --- a/sfx2/source/sidebar/PanelTitleBar.hxx +++ b/sfx2/source/sidebar/PanelTitleBar.hxx @@ -61,7 +61,6 @@ private: const sal_uInt16 mnMenuItemIndex; css::uno::Reference<css::frame::XFrame> mxFrame; ::rtl::OUString msMoreOptionsCommand; - ::rtl::OUString msAccessibleNamePrefix; }; } } // end of namespace sfx2::sidebar diff --git a/sfx2/source/sidebar/Sidebar.hrc b/sfx2/source/sidebar/Sidebar.hrc index a351c1ea05e6..8f62aecbc91d 100644 --- a/sfx2/source/sidebar/Sidebar.hrc +++ b/sfx2/source/sidebar/Sidebar.hrc @@ -56,6 +56,5 @@ #define SFX_STR_SIDEBAR_MORE_OPTIONS (RID_SFX_SIDEBAR_START + 1) #define SFX_STR_SIDEBAR_CLOSE_DECK (RID_SFX_SIDEBAR_START + 2) -#define SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX (RID_SFX_SIDEBAR_START + 3) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src index eaa55c08d870..a929dc501ef7 100644 --- a/sfx2/source/sidebar/Sidebar.src +++ b/sfx2/source/sidebar/Sidebar.src @@ -170,9 +170,5 @@ String SFX_STR_SIDEBAR_CLOSE_DECK Text [en-US] = "Close Sidebar Deck"; }; -String SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX -{ - Text [en-US] = "Panel: "; -}; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |