diff options
| -rw-r--r-- | accessibility/source/extended/accessiblelistbox.cxx | 26 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 8 |
2 files changed, 32 insertions, 2 deletions
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index f75f9a1b265f..2db3debe33a4 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -132,6 +132,32 @@ namespace accessibility } } break; + + // --> OD 2009-04-01 #i92103# + case VCLEVENT_LISTBOX_ENTRY_EXPANDED : + case VCLEVENT_LISTBOX_ENTRY_COLLAPSED : + { + SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() ); + if ( pEntry ) + { + AccessibleListBoxEntry* pAccListBoxEntry = + new AccessibleListBoxEntry( *getListBox(), pEntry, this ); + Reference< XAccessible > xChild = pAccListBoxEntry; + const short nAccEvent = + ( rVclWindowEvent.GetId() == VCLEVENT_LISTBOX_ENTRY_EXPANDED ) + ? AccessibleEventId::LISTBOX_ENTRY_EXPANDED + : AccessibleEventId::LISTBOX_ENTRY_COLLAPSED; + uno::Any aListBoxEntry; + aListBoxEntry <<= xChild; + NotifyAccessibleEvent( nAccEvent, Any(), aListBoxEntry ); + if ( getListBox() && getListBox()->HasFocus() ) + { + NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, Any(), aListBoxEntry ); + } + } + break; + } + // <-- } default: VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent); diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index f89dbe1767c3..76507d22e3cf 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -47,6 +47,7 @@ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <vcl/unohelp2.hxx> +#include <vcl/help.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/externallock.hxx> #include <unotools/accessiblestatesethelper.hxx> @@ -618,9 +619,12 @@ awt::FontDescriptor SAL_CALL VCLXAccessibleToolBoxItem::getFontMetrics( const Re ::rtl::OUString sRet; if ( m_pToolBox ) { - sRet = m_pToolBox->GetQuickHelpText( m_nItemId ); + if ( Help::IsExtHelpEnabled() ) + sRet = m_pToolBox->GetHelpText( m_nItemId ); + else + sRet = m_pToolBox->GetQuickHelpText( m_nItemId ); if ( !sRet.getLength() ) - // no quick help text set, so use item text + // no help text set, so use item text sRet = m_pToolBox->GetItemText( m_nItemId ); } return sRet; |