diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-07-01 17:30:37 +0200 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-07-01 17:30:37 +0200 |
| commit | 9ce59a2d62ba6de3c358b870856f521c130c7c15 (patch) | |
| tree | 86ffa5ae726ef38d53253e2ca9912d7b9f4c3666 /accessibility/source/extended | |
| parent | ce9c31ba3fe2cdf3eadc2114ddd619af24a147be (diff) | |
| parent | 273fa6a6aa0d56660807ab29892f0618cfbb2e63 (diff) | |
cws tl81: merge with DEV300_m84
Diffstat (limited to 'accessibility/source/extended')
3 files changed, 2 insertions, 15 deletions
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index 352e80e1a666..f6d1147ad309 100755 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -220,19 +220,6 @@ Sequence< sal_Int8 > SAL_CALL AccessibleGridControlTableBase::getImplementationI // internal helper methods ---------------------------------------------------- -sal_uInt16 AccessibleGridControlTableBase::implToVCLColumnPos( sal_Int32 nColumn ) const -{ - sal_uInt16 nVCLPos = 0; - if( (0 <= nColumn) && (nColumn < m_aTable.GetColumnCount()) ) - { - // regard "handle column" - if( m_aTable.HasRowHeader() ) - ++nColumn; - nVCLPos = static_cast< sal_uInt16 >( nColumn ); - } - return nVCLPos; -} - sal_Int32 AccessibleGridControlTableBase::implGetChildCount() const { return m_aTable.GetRowCount()*m_aTable.GetColumnCount(); diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx index 5f290178ea25..5c26185f6b03 100644 --- a/accessibility/source/extended/accessibletabbarbase.cxx +++ b/accessibility/source/extended/accessibletabbarbase.cxx @@ -63,7 +63,7 @@ IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclSimpleEvent*, pEvent ) DBG_ASSERT( pEventWindow, "AccessibleTabBarBase::WindowEventListener: no window!" ); if( ( pWinEvent->GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) && - ( (sal_uInt16)(sal_IntPtr) pWinEvent->GetData() == TABBAR_PAGE_NOTFOUND ) && + ( (sal_uInt16)(sal_IntPtr) pWinEvent->GetData() == TabBar::PAGE_NOT_FOUND ) && ( dynamic_cast< AccessibleTabBarPageList *> (this) != NULL ) ) { return 0; diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index e852e0ed54cc..51c86003b0c2 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -313,7 +313,7 @@ namespace accessibility { sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData(); - if ( nPageId == TABBAR_PAGE_NOTFOUND ) + if ( nPageId == TabBar::PAGE_NOT_FOUND ) { for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i >= 0; --i ) RemoveChild( i ); |