cws tl81: merge with DEV300_m84

4 files changed, 2 insertions, 23 deletions

diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
index 28d9cfb919f1..bee42d85e2a2 100755
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
@@ -174,14 +174,6 @@ protected:
     // internal helper methods ------------------------------------------------
 
     /** @attention  This method requires locked mutex's and a living object.
-        @param nColumn
-            the position of the column in the Accessible world
-        @return
-            the position of the column in VCL the Accessible world
-    */
-    sal_uInt16 implToVCLColumnPos( sal_Int32 nColumn ) const;
-
-    /** @attention  This method requires locked mutex's and a living object.
         @return  The number of cells of the table. */
     sal_Int32 implGetChildCount() const;
 
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 );