summaryrefslogtreecommitdiff
path: root/winaccessibility/source/UAccCOM/AccTable.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'winaccessibility/source/UAccCOM/AccTable.cxx')
-rw-r--r--winaccessibility/source/UAccCOM/AccTable.cxx112
1 files changed, 56 insertions, 56 deletions
diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx
index 496a39d16bb7..63f9edf7ec14 100644
--- a/winaccessibility/source/UAccCOM/AccTable.cxx
+++ b/winaccessibility/source/UAccCOM/AccTable.cxx
@@ -54,7 +54,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_accessibleAt(long row, long col
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(accessible == nullptr)
@@ -96,7 +96,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_accessibleAt(long row, long col
}
return E_FAIL;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_cellAt(long row, long column, IUnknown * * cell)
@@ -124,7 +124,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_columnDescription(long column,
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(description == nullptr)
@@ -143,7 +143,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_columnDescription(long column,
return E_FAIL;
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -157,7 +157,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_columnExtentAt(long row, long c
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// Check pointer.
if(nColumnsSpanned == nullptr)
@@ -169,7 +169,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_columnExtentAt(long row, long c
*nColumnsSpanned = pRXTable->getAccessibleColumnExtentAt(row, column);
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -182,7 +182,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_columnHeader(IAccessibleTable _
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(accessibleTable == nullptr || startingRowIndex == nullptr)
@@ -220,7 +220,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_columnHeader(IAccessibleTable _
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -232,7 +232,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_nColumns(long * columnCount)
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(columnCount == nullptr)
@@ -245,7 +245,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_nColumns(long * columnCount)
*columnCount = pRXTable->getAccessibleColumnCount();
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -257,7 +257,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_nRows(long * rowCount)
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(rowCount == nullptr)
@@ -270,7 +270,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_nRows(long * rowCount)
*rowCount = pRXTable->getAccessibleRowCount();
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -282,7 +282,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_nSelectedColumns(long * columnC
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(columnCount == nullptr)
@@ -296,7 +296,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_nSelectedColumns(long * columnC
*columnCount = pSelected.getLength();
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -308,7 +308,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_nSelectedRows(long * rowCount)
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(rowCount == nullptr)
@@ -322,7 +322,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_nSelectedRows(long * rowCount)
*rowCount = pSelected.getLength();
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -335,7 +335,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_rowDescription(long row, BSTR *
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(description == nullptr)
@@ -354,7 +354,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_rowDescription(long row, BSTR *
return E_FAIL;
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -368,7 +368,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_rowExtentAt(long row, long colu
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// Check pointer.
if(nRowsSpanned == nullptr)
@@ -381,7 +381,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_rowExtentAt(long row, long colu
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -394,7 +394,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_rowHeader(IAccessibleTable __RP
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(accessibleTable == nullptr || startingColumnIndex == nullptr)
@@ -432,7 +432,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_rowHeader(IAccessibleTable __RP
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -445,7 +445,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_selectedRows(long** rows, long*
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(rows == nullptr || nRows == nullptr)
@@ -470,7 +470,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_selectedRows(long** rows, long*
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -495,7 +495,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_selectedColumns(long ** columns
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(columns == nullptr || numColumns == nullptr)
@@ -520,7 +520,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_selectedColumns(long ** columns
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -544,7 +544,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_summary(IUnknown * * accessible
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(accessible == nullptr)
@@ -568,7 +568,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_summary(IUnknown * * accessible
return E_FAIL;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -581,7 +581,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_isColumnSelected(long column, b
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(isSelected == nullptr)
@@ -594,7 +594,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_isColumnSelected(long column, b
*isSelected = pRXTable->isAccessibleColumnSelected(column);
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -607,7 +607,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_isRowSelected(long row, boolean
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(isSelected == nullptr)
@@ -620,7 +620,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_isRowSelected(long row, boolean
*isSelected = pRXTable->isAccessibleRowSelected(row);
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -634,7 +634,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_isSelected(long row, long colum
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(isSelected == nullptr)
@@ -647,7 +647,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_isSelected(long row, long colum
*isSelected = pRXTable->isAccessibleSelected(row, column);
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -660,7 +660,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::selectRow(long row)
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// Check XAccessibleTable reference.
if(!pRXTable.is())
@@ -691,7 +691,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::selectRow(long row)
return S_OK;
}
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -704,7 +704,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::selectColumn(long column)
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// Check XAccessibleTable reference.
if(!pRXTable.is())
@@ -736,7 +736,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::selectColumn(long column)
}
// End of added.
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -749,7 +749,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::unselectRow(long row)
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// Check XAccessibleTable reference.
if(!pRXTable.is())
@@ -783,7 +783,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::unselectRow(long row)
}
// End of added.
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -796,7 +796,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::unselectColumn(long column)
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// Check XAccessibleTable reference.
if(!pRXTable.is())
@@ -829,7 +829,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::unselectColumn(long column)
return S_OK;
}
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -841,7 +841,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::put_XInterface(hyper pXInterface)
{
// internal IUNOXWrapper - no mutex meeded
- ENTER_PROTECTED_BLOCK
+ try {
CUNOXWrapper::put_XInterface(pXInterface);
//special query.
@@ -859,7 +859,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::put_XInterface(hyper pXInterface)
pRXTable = pRXI.get();
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
@@ -872,7 +872,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_columnIndex(long childIndex, lo
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(columnIndex == nullptr)
@@ -885,7 +885,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_columnIndex(long childIndex, lo
*columnIndex = pRXTable->getAccessibleColumn(childIndex);
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
* Gets rowIndex of childIndex.
@@ -896,7 +896,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_rowIndex(long childIndex, long
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(rowIndex == nullptr)
@@ -909,7 +909,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_rowIndex(long childIndex, long
*rowIndex = pRXTable->getAccessibleRow(childIndex);
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/**
@@ -921,7 +921,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_childIndex(long RowIndex , long
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(childIndex == nullptr)
@@ -934,7 +934,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_childIndex(long RowIndex , long
*childIndex = pRXTable->getAccessibleIndex(RowIndex, columnIndex);
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_rowColumnExtentsAtIndex(long,
@@ -959,7 +959,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_nSelectedChildren(long *childCo
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(childCount == nullptr)
@@ -976,7 +976,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_nSelectedChildren(long *childCo
*childCount = pRSelection->getSelectedAccessibleChildCount();
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
@@ -997,7 +997,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_selectedChildren(long, long **c
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
// #CHECK#
if(children == nullptr || nChildren == nullptr)
@@ -1033,7 +1033,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_selectedChildren(long, long **c
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
@@ -1049,7 +1049,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_selectedCells(IUnknown * * * ce
{
SolarMutexGuard g;
- ENTER_PROTECTED_BLOCK
+ try {
if (cells == nullptr || nSelectedCells == nullptr)
return E_INVALIDARG;
@@ -1089,7 +1089,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_selectedCells(IUnknown * * * ce
return S_OK;
- LEAVE_PROTECTED_BLOCK
+ } catch(...) { return E_FAIL; }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */