diff options
| -rw-r--r-- | accessibility/inc/accessibility/extended/accessibletablistbox.hxx | 4 | ||||
| -rw-r--r-- | include/svtools/accessibletableprovider.hxx | 8 | ||||
| -rw-r--r-- | svtools/source/contnr/svtabbx.cxx | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx index d14d764844da..985642e0aeb3 100644 --- a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx +++ b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx @@ -83,9 +83,9 @@ public: } ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) + getHeaderBar() { - return AccessibleBrowseBox::getHeaderBar( _eObjType ); + return AccessibleBrowseBox::getHeaderBar( svt::BBTYPE_COLUMNHEADERBAR ); } protected: diff --git a/include/svtools/accessibletableprovider.hxx b/include/svtools/accessibletableprovider.hxx index 973ec03f875a..acd3feace9a9 100644 --- a/include/svtools/accessibletableprovider.hxx +++ b/include/svtools/accessibletableprovider.hxx @@ -145,14 +145,10 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > getMyself() = 0; - virtual css::uno::Reference< css::accessibility::XAccessible > - SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) = 0; - - /** returns the accessible object for the row or the column header bar + /** returns the accessible object for the column header bar */ virtual css::uno::Reference< css::accessibility::XAccessible > - getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) = 0; + getHeaderBar() = 0; protected: ~IAccessibleTabListBox() {} diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index c07ca6ec4d4f..c2ecf34a12be 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -921,10 +921,10 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleCell( sal_Int32 _nR sal_Bool bIsCheckBox = IsCellCheckBox( _nRow, _nColumnPos, eState ); if ( bIsCheckBox ) xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleCheckBoxCell( - m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos, eState, false ); + m_pAccessible->getHeaderBar(), *this, NULL, _nRow, _nColumnPos, eState, false ); else xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxTableCell( - m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos, OFFSET_NONE ); + m_pAccessible->getHeaderBar(), *this, NULL, _nRow, _nColumnPos, OFFSET_NONE ); // insert into list if ( !AreChildrenTransient() ) @@ -958,7 +958,7 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleColumnHeader( sal_u { // no -> create new header cell xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxHeaderCell( - _nColumn, m_pAccessible->getHeaderBar( ::svt::BBTYPE_COLUMNHEADERBAR ), + _nColumn, m_pAccessible->getHeaderBar(), *this, NULL, ::svt::BBTYPE_COLUMNHEADERCELL ); |