summaryrefslogtreecommitdiff
path: root/accessibility
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2011-02-17 16:53:53 +0100
committerIvo Hinkelmann <ihi@openoffice.org>2011-02-17 16:53:53 +0100
commit1cc0f307a513d97fac65c1dda1492123ecacdef4 (patch)
treec41301d02f062af3a59bb5bc2abe0d157f305a21 /accessibility
parent22e7f369d3c34a2fa0cf16307d5c047bcc24be79 (diff)
parent779f996a8c6039adbd2424b8dcc36219912f80b9 (diff)
CWS-TOOLING: integrate CWS gridsort
Diffstat (limited to 'accessibility')
-rwxr-xr-xaccessibility/source/extended/AccessibleGridControlTable.cxx6
-rw-r--r--[-rwxr-xr-x]accessibility/source/extended/AccessibleGridControlTableBase.cxx5
2 files changed, 6 insertions, 5 deletions
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 461e776f1392..406baeb2973c 100755
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -245,8 +245,7 @@ void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChil
ensureIsValidIndex( nChildIndex );
sal_Int32 nColumns = m_aTable.GetColumnCount();
sal_Int32 nRow = (nChildIndex / nColumns);
- std::vector< sal_Int32 > selectedRows = m_aTable.GetSelectedRows();
- selectedRows.push_back(nRow);
+ m_aTable.SelectRow( nRow, sal_True );
}
sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int32 nChildIndex )
throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
@@ -265,8 +264,7 @@ void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection()
TCSolarGuard aSolarGuard;
::osl::MutexGuard aGuard( getOslMutex() );
ensureIsAlive();
- for(unsigned int i=0;i<m_aTable.GetSelectedRows().size();i++)
- m_aTable.RemoveSelectedRow((sal_Int32)i);
+ m_aTable.SelectAllRows( false );
}
void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren()
throw ( uno::RuntimeException )
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index f6d1147ad309..d97feb1277ec 100755..100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -245,7 +245,10 @@ sal_Int32 AccessibleGridControlTableBase::implGetChildIndex(
void AccessibleGridControlTableBase::implGetSelectedRows( Sequence< sal_Int32 >& rSeq )
{
- rSeq = comphelper::containerToSequence(m_aTable.GetSelectedRows());
+ sal_Int32 const selectionCount( m_aTable.GetSelectedRowCount() );
+ rSeq.realloc( selectionCount );
+ for ( sal_Int32 i=0; i<selectionCount; ++i )
+ rSeq[i] = m_aTable.GetSelectedRowIndex(i);
}
void AccessibleGridControlTableBase::ensureIsValidRow( sal_Int32 nRow )