View | Details | Raw Unified | Return to issue 124856
Collapse All | Expand All

(-)accessibility/source/standard/vclxaccessiblebox.cxx (-7 / +4 lines)
Lines 182-188 Link Here
182
		case VCLEVENT_COMBOBOX_SELECT:
182
		case VCLEVENT_COMBOBOX_SELECT:
183
		{
183
		{
184
	             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
184
	             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
185
	             if (pList != NULL)
185
	             if (pList != NULL && m_xText.is())
186
	             {
186
	             {
187
		                Reference<XAccessibleText> xText (m_xText->getAccessibleContext(), UNO_QUERY);
187
		                Reference<XAccessibleText> xText (m_xText->getAccessibleContext(), UNO_QUERY);
188
		                if ( xText.is() )
188
		                if ( xText.is() )
Lines 416-422 Link Here
416
416
417
    // There is one action for drop down boxes (toggle popup) and none for
417
    // There is one action for drop down boxes (toggle popup) and none for
418
    // the other boxes.
418
    // the other boxes.
419
	return m_bIsDropDownBox ? 0 : 1;
419
	return m_bIsDropDownBox ? 1 : 0;
420
}
420
}
421
421
422
sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex)
422
sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex)
Lines 463-473 Link Here
463
	::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
463
	::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
464
    if (nIndex<0 || nIndex>=getAccessibleActionCount())
464
    if (nIndex<0 || nIndex>=getAccessibleActionCount())
465
        throw ::com::sun::star::lang::IndexOutOfBoundsException();
465
        throw ::com::sun::star::lang::IndexOutOfBoundsException();
466
	//Solution:When combo_box,it should not has action information.
466
467
    //return TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP);
467
	return m_bIsDropDownBox ? TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP) : ::rtl::OUString();
468
	if (m_aBoxType == LISTBOX)
469
		return ::rtl::OUString();
470
	return m_bIsDropDownBox?::rtl::OUString():TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP);
471
}
468
}
472
469
473
Reference< XAccessibleKeyBinding > VCLXAccessibleBox::getAccessibleActionKeyBinding( sal_Int32 nIndex )
470
Reference< XAccessibleKeyBinding > VCLXAccessibleBox::getAccessibleActionKeyBinding( sal_Int32 nIndex )

Return to issue 124856