accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 16 +++++++----- 1 file changed, 10 insertions(+), 6 deletions(-)
New commits: commit 091eeeab04807795a8bc8cd78b9adb369a207ee6 Author: Jacobo Aragunde Pérez <[email protected]> Date: Mon Jun 16 17:28:55 2014 +0200 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 <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index ff903d1..7b7cf59 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; + } } }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
