Kaydet (Commit) f9cc7509 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Reduce IAccessibleTabListBox to what's actually used

...the calls to getAccessibleChild(0) and getHeaderBar(BBYTE_COLUMNHEADERBAR)
ultimately all ended up at
AccessibleBrowseBox::implGetHeaderBar(BBTYPE_COLUMNHEADERBAR).

Change-Id: Ie25659e19d0d1ce2dcde2d1440ecc69b4fa265b0
üst d96a2f43
...@@ -83,9 +83,9 @@ public: ...@@ -83,9 +83,9 @@ public:
} }
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ::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: protected:
......
...@@ -145,14 +145,10 @@ public: ...@@ -145,14 +145,10 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessible > virtual css::uno::Reference< css::accessibility::XAccessible >
getMyself() = 0; getMyself() = 0;
virtual css::uno::Reference< css::accessibility::XAccessible > /** returns the accessible object for the column header bar
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
*/ */
virtual css::uno::Reference< css::accessibility::XAccessible > virtual css::uno::Reference< css::accessibility::XAccessible >
getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) = 0; getHeaderBar() = 0;
protected: protected:
~IAccessibleTabListBox() {} ~IAccessibleTabListBox() {}
......
...@@ -921,10 +921,10 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleCell( sal_Int32 _nR ...@@ -921,10 +921,10 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleCell( sal_Int32 _nR
sal_Bool bIsCheckBox = IsCellCheckBox( _nRow, _nColumnPos, eState ); sal_Bool bIsCheckBox = IsCellCheckBox( _nRow, _nColumnPos, eState );
if ( bIsCheckBox ) if ( bIsCheckBox )
xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleCheckBoxCell( 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 else
xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxTableCell( 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 // insert into list
if ( !AreChildrenTransient() ) if ( !AreChildrenTransient() )
...@@ -958,7 +958,7 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleColumnHeader( sal_u ...@@ -958,7 +958,7 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleColumnHeader( sal_u
{ {
// no -> create new header cell // no -> create new header cell
xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxHeaderCell( xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxHeaderCell(
_nColumn, m_pAccessible->getHeaderBar( ::svt::BBTYPE_COLUMNHEADERBAR ), _nColumn, m_pAccessible->getHeaderBar(),
*this, NULL, ::svt::BBTYPE_COLUMNHEADERCELL *this, NULL, ::svt::BBTYPE_COLUMNHEADERCELL
); );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment