recent changes for grid control

1 files changed, 12 insertions, 37 deletions

diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index a5a2be4049dc..fe02c92222fd 100755
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -59,8 +59,6 @@ namespace accessibility {
 
 // ============================================================================
 
-// Ctor/Dtor/disposing --------------------------------------------------------
-
 DBG_NAME( AccessibleGridControlHeader )
 
 AccessibleGridControlHeader::AccessibleGridControlHeader(
@@ -69,15 +67,12 @@ AccessibleGridControlHeader::AccessibleGridControlHeader(
         ::svt::table::AccessibleTableControlObjType      eObjType):
         AccessibleGridControlTableBase( rxParent, rTable, eObjType )
 {
-//    DBG_CTOR( AccessibleGridControlHeaderBar, NULL );
-
     DBG_ASSERT( isRowBar() || isColumnBar(),
         "accessibility/extended/AccessibleGridControlHeaderBar - invalid object type" );
 }
 
 AccessibleGridControlHeader::~AccessibleGridControlHeader()
 {
-//    DBG_DTOR( AccessibleGridControlHeader, NULL );
 }
 
 // XAccessibleContext ---------------------------------------------------------
@@ -184,35 +179,24 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibl
     ensureIsAlive();
     return NULL;        // no headers in headers
 }
-
+//not selectable
 Sequence< sal_Int32 > SAL_CALL AccessibleGridControlHeader::getSelectedAccessibleRows()
     throw ( uno::RuntimeException )
 {
-    TCSolarGuard aSolarGuard;
-    ::osl::MutexGuard aGuard( getOslMutex() );
-    ensureIsAlive();
-
-    Sequence< sal_Int32 > aSelSeq;
-    // row of column header bar not selectable
-    if( isRowBar() )
-        implGetSelectedRows( aSelSeq );
+    Sequence< sal_Int32 > aSelSeq(0);
     return aSelSeq;
 }
 //columns aren't selectable
 Sequence< sal_Int32 > SAL_CALL AccessibleGridControlHeader::getSelectedAccessibleColumns()
     throw ( uno::RuntimeException )
 {
-    return NULL;
+    Sequence< sal_Int32 > aSelSeq(0);
+    return aSelSeq;
 }
-//To Do - not yet implemented
-sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleRowSelected( sal_Int32 nRow )
+//row headers not selectable
+sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleRowSelected( sal_Int32 /*nRow*/ )
     throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
 {
-    TCSolarGuard aSolarGuard;
-    ::osl::MutexGuard aGuard( getOslMutex() );
-    ensureIsAlive();
-    ensureIsValidRow( nRow );
-    //return isRowBar() ? implIsRowSelected( nRow ) : sal_False;
     return sal_False;
 }
 //columns aren't selectable
@@ -222,28 +206,19 @@ sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleColumnSelected( sal_I
     (void)nColumn;
     return sal_False;
 }
-
+//not implemented
 Reference< XAccessible > SAL_CALL AccessibleGridControlHeader::getAccessibleCellAt(
-        sal_Int32 nRow, sal_Int32 nColumn )
+        sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ )
     throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
 {
-    TCSolarGuard aSolarGuard;
-    ::osl::MutexGuard aGuard( getOslMutex() );
-    ensureIsAlive();
-    ensureIsValidAddress( nRow, nColumn );
-    return implGetChild( nRow, implToVCLColumnPos( nColumn ) );
+    return NULL;
 }
-// TO DO - not implemented yet
+// not selectable
 sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleSelected(
-        sal_Int32 nRow, sal_Int32 nColumn )
+        sal_Int32 /*nRow*/, sal_Int32 /*nColumn */)
     throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
 {
-    TCSolarGuard aSolarGuard;
-    ::osl::MutexGuard aGuard( getOslMutex() );
-    ensureIsAlive();
-    ensureIsValidAddress( nRow, nColumn );
-    return FALSE;
-   // return isRowBar() ? implIsRowSelected( nRow ) : implIsColumnSelected( nColumn );
+    return sal_False;
 }
 
 // XServiceInfo ---------------------------------------------------------------