diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-06-16 17:28:55 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-27 10:40:14 +0000 |
| commit | 091eeeab04807795a8bc8cd78b9adb369a207ee6 (patch) | |
| tree | b3d3da8c9af3e6356319df0c4dca9919a74b8e74 | |
| parent | c22fcb268cad9e0394f6af01f10a327f7e2ff5bd (diff) | |
fdo#74681: quick help may be used as accessible text
In case a tool box item does not contain some text to be used as the
accessible item name, use the quick help text.
Change-Id: I9caadb0989729787d8572f4007652bcab02b0412
(cherry picked from commit 9b2582064882bb1a1caea72fe7754b8872a16413)
Reviewed-on: https://gerrit.libreoffice.org/9900
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index ff903d166c02..7b7cf5949429 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -130,13 +130,17 @@ OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName ) sRet = m_pToolBox->GetItemText( m_nItemId ); if (sRet.isEmpty()) { - Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId ); - if ( m_nRole == AccessibleRole::PANEL && pItemWindow && pItemWindow->GetAccessible().is() && - pItemWindow->GetAccessible()->getAccessibleContext().is() ) + sRet = m_pToolBox->GetQuickHelpText( m_nItemId ); + if (sRet.isEmpty()) { - OUString sWinText = pItemWindow->GetAccessible()->getAccessibleContext()->getAccessibleName(); - if (!sWinText.isEmpty()) - sRet = sWinText; + Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId ); + if ( m_nRole == AccessibleRole::PANEL && pItemWindow && pItemWindow->GetAccessible().is() && + pItemWindow->GetAccessible()->getAccessibleContext().is() ) + { + OUString sWinText = pItemWindow->GetAccessible()->getAccessibleContext()->getAccessibleName(); + if (!sWinText.isEmpty()) + sRet = sWinText; + } } } |