Skip to content

C
core
Kaydet (Commit) dd7df934 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

winaccessibility: remove CheckEnableAccessible.h and assorted noise 

Change-Id: I45e1d72b1abf64a965397c50ac3b95b5bbee3206
üst cbda6da0
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 328 deletions
winaccessibility/source/UAccCOM/AccActionBase.cxx
Dosyayı görüntüle @ dd7df934
......@@ -107,9 +107,6 @@ void GetDfActionByUNORole(XAccessibleContext* pRContext, BSTR* pRet)
*/
STDMETHODIMP CAccActionBase::nActions(/*[out,retval]*/long* nActions)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -132,9 +129,6 @@ STDMETHODIMP CAccActionBase::nActions(/*[out,retval]*/long* nActions)
*/
STDMETHODIMP CAccActionBase::doAction(/* [in] */ long actionIndex)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if( pRXAct.is() )
......@@ -154,9 +148,6 @@ STDMETHODIMP CAccActionBase::doAction(/* [in] */ long actionIndex)
*/
STDMETHODIMP CAccActionBase::get_description(long actionIndex,BSTR __RPC_FAR *description)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -204,9 +195,6 @@ STDMETHODIMP CAccActionBase::get_keyBinding(
/* [length_is][length_is][size_is][size_is][out] */ BSTR __RPC_FAR *__RPC_FAR *keyBinding,
/* [retval][out] */ long __RPC_FAR *nBinding)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if( !keyBinding || !nBinding)
......
winaccessibility/source/UAccCOM/AccComponentBase.cxx
Dosyayı görüntüle @ dd7df934
......@@ -45,9 +45,6 @@ CAccComponentBase::~CAccComponentBase()
*/
STDMETHODIMP CAccComponentBase::get_locationInParent(long *x, long *y)
{
CHECK_ENABLE_INF
try
{
if (x == NULL || y == NULL)
......@@ -76,9 +73,6 @@ STDMETHODIMP CAccComponentBase::get_locationInParent(long *x, long *y)
*/
STDMETHODIMP CAccComponentBase::get_locationOnScreen(long *x, long *y)
{
CHECK_ENABLE_INF
try
{
if (x == NULL || y == NULL)
......@@ -106,9 +100,6 @@ STDMETHODIMP CAccComponentBase::get_locationOnScreen(long *x, long *y)
*/
STDMETHODIMP CAccComponentBase::grabFocus(boolean * success)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (success == NULL)
......@@ -133,9 +124,6 @@ STDMETHODIMP CAccComponentBase::grabFocus(boolean * success)
*/
STDMETHODIMP CAccComponentBase::get_foreground(IA2Color * foreground)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (foreground == NULL)
......@@ -159,9 +147,6 @@ STDMETHODIMP CAccComponentBase::get_foreground(IA2Color * foreground)
*/
STDMETHODIMP CAccComponentBase::get_background(IA2Color * background)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (background == NULL)
......@@ -185,9 +170,6 @@ STDMETHODIMP CAccComponentBase::get_background(IA2Color * background)
*/
STDMETHODIMP CAccComponentBase::put_XInterface(hyper pXInterface)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
CUNOXWrapper::put_XInterface(pXInterface);
......
winaccessibility/source/UAccCOM/AccEditableText.cxx
Dosyayı görüntüle @ dd7df934
......@@ -47,9 +47,6 @@ using namespace std;
*/
STDMETHODIMP CAccEditableText::copyText(long startOffset, long endOffset)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK XInterface#
......@@ -75,9 +72,6 @@ STDMETHODIMP CAccEditableText::copyText(long startOffset, long endOffset)
*/
STDMETHODIMP CAccEditableText::deleteText(long startOffset, long endOffset)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if( !pRXEdtTxt.is() )
......@@ -100,9 +94,6 @@ STDMETHODIMP CAccEditableText::deleteText(long startOffset, long endOffset)
*/
STDMETHODIMP CAccEditableText::insertText(long offset, BSTR * text)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (text == NULL)
......@@ -130,9 +121,6 @@ STDMETHODIMP CAccEditableText::insertText(long offset, BSTR * text)
*/
STDMETHODIMP CAccEditableText::cutText(long startOffset, long endOffset)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if( !pRXEdtTxt.is() )
......@@ -154,9 +142,6 @@ STDMETHODIMP CAccEditableText::cutText(long startOffset, long endOffset)
*/
STDMETHODIMP CAccEditableText::pasteText(long offset)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if( !pRXEdtTxt.is() )
......@@ -180,9 +165,6 @@ STDMETHODIMP CAccEditableText::pasteText(long offset)
*/
STDMETHODIMP CAccEditableText::replaceText(long startOffset, long endOffset, BSTR * text)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -210,9 +192,6 @@ STDMETHODIMP CAccEditableText::replaceText(long startOffset, long endOffset, BST
*/
STDMETHODIMP CAccEditableText::setAttributes(long startOffset, long endOffset, BSTR * attributes)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......
winaccessibility/source/UAccCOM/AccHyperLink.cxx
Dosyayı görüntüle @ dd7df934
......@@ -102,9 +102,6 @@ STDMETHODIMP CAccHyperLink::get_keyBinding(
STDMETHODIMP CAccHyperLink::get_anchor(/* [in] */ long index,
/* [retval][out] */ VARIANT __RPC_FAR *anchor)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -135,9 +132,6 @@ STDMETHODIMP CAccHyperLink::get_anchor(/* [in] */ long index,
STDMETHODIMP CAccHyperLink::get_anchorTarget(/* [in] */ long index,
/* [retval][out] */ VARIANT __RPC_FAR *anchorTarget)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -168,9 +162,6 @@ STDMETHODIMP CAccHyperLink::get_anchorTarget(/* [in] */ long index,
*/
STDMETHODIMP CAccHyperLink::get_startIndex(/* [retval][out] */ long __RPC_FAR *index)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -192,9 +183,6 @@ STDMETHODIMP CAccHyperLink::get_startIndex(/* [retval][out] */ long __RPC_FAR *i
*/
STDMETHODIMP CAccHyperLink::get_endIndex(/* [retval][out] */ long __RPC_FAR *index)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -221,9 +209,6 @@ STDMETHODIMP CAccHyperLink::get_endIndex(/* [retval][out] */ long __RPC_FAR *ind
*/
STDMETHODIMP CAccHyperLink::get_valid(/* [retval][out] */ boolean __RPC_FAR *valid)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -250,9 +235,6 @@ STDMETHODIMP CAccHyperLink::get_valid(/* [retval][out] */ boolean __RPC_FAR *val
*/
STDMETHODIMP CAccHyperLink::put_XInterface(hyper pXInterface)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
CAccActionBase::put_XInterface(pXInterface);
......@@ -284,9 +266,6 @@ STDMETHODIMP CAccHyperLink::put_XInterface(hyper pXInterface)
*/
STDMETHODIMP CAccHyperLink::put_XSubInterface(hyper pXSubInterface)
{
CHECK_ENABLE_INF
pRXLink = reinterpret_cast<XAccessibleHyperlink*>(pXSubInterface);
pRXAct = reinterpret_cast<XAccessibleAction*>(pXSubInterface);
......
winaccessibility/source/UAccCOM/AccHypertext.cxx
Dosyayı görüntüle @ dd7df934
......@@ -276,9 +276,6 @@ STDMETHODIMP CAccHypertext::scrollSubstringTo(long startIndex, long endIndex,enu
*/
STDMETHODIMP CAccHypertext::get_nHyperlinks(long *hyperlinkCount)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -304,9 +301,6 @@ STDMETHODIMP CAccHypertext::get_nHyperlinks(long *hyperlinkCount)
*/
STDMETHODIMP CAccHypertext::get_hyperlink(long index,IAccessibleHyperlink **hyperlink)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -353,9 +347,6 @@ STDMETHODIMP CAccHypertext::get_hyperlink(long index,IAccessibleHyperlink **hype
*/
STDMETHODIMP CAccHypertext::get_hyperlinkIndex(long charIndex, long *hyperlinkIndex)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......
winaccessibility/source/UAccCOM/AccImage.cxx
Dosyayı görüntüle @ dd7df934
......@@ -33,9 +33,6 @@ using namespace com::sun::star::uno;
*/
STDMETHODIMP CAccImage::get_description(BSTR * description)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......
winaccessibility/source/UAccCOM/AccRelation.cxx
Dosyayı görüntüle @ dd7df934
......@@ -34,9 +34,6 @@ using namespace com::sun::star::uno;
*/
STDMETHODIMP CAccRelation::get_relationType(BSTR * relationType)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (relationType == NULL)
......@@ -70,11 +67,8 @@ STDMETHODIMP CAccRelation::get_localizedRelationType(BSTR *)
*/
STDMETHODIMP CAccRelation::get_nTargets(long * nTargets)
{
ENTER_PROTECTED_BLOCK
CHECK_ENABLE_INF
if (nTargets == NULL)
return E_INVALIDARG;
......@@ -93,9 +87,6 @@ STDMETHODIMP CAccRelation::get_nTargets(long * nTargets)
*/
STDMETHODIMP CAccRelation::get_target(long targetIndex, IUnknown * * target)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (target == NULL)
......@@ -131,9 +122,6 @@ STDMETHODIMP CAccRelation::get_target(long targetIndex, IUnknown * * target)
*/
STDMETHODIMP CAccRelation::get_targets(long, IUnknown * * target, long * nTargets)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......
winaccessibility/source/UAccCOM/AccTable.cxx
Dosyayı görüntüle @ dd7df934
......@@ -43,9 +43,6 @@ using namespace com::sun::star::uno;
STDMETHODIMP CAccTable::get_accessibleAt(long row, long column, IUnknown * * accessible)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -115,9 +112,6 @@ STDMETHODIMP CAccTable::get_caption(IUnknown * *)
*/
STDMETHODIMP CAccTable::get_columnDescription(long column, BSTR * description)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -149,9 +143,6 @@ STDMETHODIMP CAccTable::get_columnDescription(long column, BSTR * description)
*/
STDMETHODIMP CAccTable::get_columnExtentAt(long row, long column, long * nColumnsSpanned)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
XAccessibleTable *pXAccTable = GetXInterface();
......@@ -183,9 +174,6 @@ STDMETHODIMP CAccTable::get_columnExtentAt(long row, long column, long * nColumn
*/
STDMETHODIMP CAccTable::get_columnHeader(IAccessibleTable __RPC_FAR *__RPC_FAR *accessibleTable, long *startingRowIndex)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -234,9 +222,6 @@ STDMETHODIMP CAccTable::get_columnHeader(IAccessibleTable __RPC_FAR *__RPC_FAR *
*/
STDMETHODIMP CAccTable::get_nColumns(long * columnCount)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -260,9 +245,6 @@ STDMETHODIMP CAccTable::get_nColumns(long * columnCount)
*/
STDMETHODIMP CAccTable::get_nRows(long * rowCount)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -286,9 +268,6 @@ STDMETHODIMP CAccTable::get_nRows(long * rowCount)
*/
STDMETHODIMP CAccTable::get_nSelectedColumns(long * columnCount)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -313,9 +292,6 @@ STDMETHODIMP CAccTable::get_nSelectedColumns(long * columnCount)
*/
STDMETHODIMP CAccTable::get_nSelectedRows(long * rowCount)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -341,9 +317,6 @@ STDMETHODIMP CAccTable::get_nSelectedRows(long * rowCount)
*/
STDMETHODIMP CAccTable::get_rowDescription(long row, BSTR * description)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -376,9 +349,6 @@ STDMETHODIMP CAccTable::get_rowDescription(long row, BSTR * description)
*/
STDMETHODIMP CAccTable::get_rowExtentAt(long row, long column, long * nRowsSpanned)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
XAccessibleTable *pXAccTable = GetXInterface();
......@@ -411,9 +381,6 @@ STDMETHODIMP CAccTable::get_rowExtentAt(long row, long column, long * nRowsSpann
*/
STDMETHODIMP CAccTable::get_rowHeader(IAccessibleTable __RPC_FAR *__RPC_FAR *accessibleTable, long *startingColumnIndex)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -464,9 +431,6 @@ STDMETHODIMP CAccTable::get_rowHeader(IAccessibleTable __RPC_FAR *__RPC_FAR *acc
*/
STDMETHODIMP CAccTable::get_selectedRows(long, long ** rows, long * nRows)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -504,9 +468,6 @@ STDMETHODIMP CAccTable::get_selectedRows(long, long ** rows, long * nRows)
*/
STDMETHODIMP CAccTable::get_selectedColumns(long, long ** columns, long * numColumns)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -542,9 +503,6 @@ STDMETHODIMP CAccTable::get_selectedColumns(long, long ** columns, long * numCol
*/
STDMETHODIMP CAccTable::get_summary(IUnknown * * accessible)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -581,9 +539,6 @@ STDMETHODIMP CAccTable::get_summary(IUnknown * * accessible)
*/
STDMETHODIMP CAccTable::get_isColumnSelected(long column, unsigned char * isSelected)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -608,9 +563,6 @@ STDMETHODIMP CAccTable::get_isColumnSelected(long column, unsigned char * isSele
*/
STDMETHODIMP CAccTable::get_isRowSelected(long row, unsigned char * isSelected)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -637,9 +589,6 @@ STDMETHODIMP CAccTable::get_isRowSelected(long row, unsigned char * isSelected)
*/
STDMETHODIMP CAccTable::get_isSelected(long row, long column, unsigned char * isSelected)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -664,9 +613,6 @@ STDMETHODIMP CAccTable::get_isSelected(long row, long column, unsigned char * is
*/
STDMETHODIMP CAccTable::selectRow(long row)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// Check XAccessibleTable reference.
......@@ -709,9 +655,6 @@ STDMETHODIMP CAccTable::selectRow(long row)
*/
STDMETHODIMP CAccTable::selectColumn(long column)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// Check XAccessibleTable reference.
......@@ -755,9 +698,6 @@ STDMETHODIMP CAccTable::selectColumn(long column)
*/
STDMETHODIMP CAccTable::unselectRow(long row)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// Check XAccessibleTable reference.
......@@ -803,9 +743,6 @@ STDMETHODIMP CAccTable::unselectRow(long row)
*/
STDMETHODIMP CAccTable::unselectColumn(long column)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// Check XAccessibleTable reference.
......@@ -849,9 +786,6 @@ STDMETHODIMP CAccTable::unselectColumn(long column)
*/
STDMETHODIMP CAccTable::put_XInterface(hyper pXInterface)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
CUNOXWrapper::put_XInterface(pXInterface);
......@@ -880,9 +814,6 @@ STDMETHODIMP CAccTable::put_XInterface(hyper pXInterface)
*/
STDMETHODIMP CAccTable::get_columnIndex(long childIndex, long * columnIndex)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -905,9 +836,6 @@ STDMETHODIMP CAccTable::get_columnIndex(long childIndex, long * columnIndex)
*/
STDMETHODIMP CAccTable::get_rowIndex(long childIndex, long * rowIndex)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -930,9 +858,6 @@ STDMETHODIMP CAccTable::get_rowIndex(long childIndex, long * rowIndex)
*/
STDMETHODIMP CAccTable::get_childIndex(long RowIndex , long columnIndex, long * childIndex )
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -956,9 +881,6 @@ STDMETHODIMP CAccTable::get_rowColumnExtentsAtIndex(long,
long *,
boolean *)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
return E_NOTIMPL;
......@@ -977,9 +899,6 @@ STDMETHODIMP CAccTable::get_modelChange(IA2TableModelChange *)
// Number of children currently selected
STDMETHODIMP CAccTable::get_nSelectedChildren(long *childCount)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -1009,9 +928,6 @@ STDMETHODIMP CAccTable::get_nSelectedChildren(long *childCount)
// Length of array (not more than maxChildren)
STDMETHODIMP CAccTable::get_selectedChildren(long, long **children, long *nChildren)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......
winaccessibility/source/UAccCOM/AccTextBase.cxx
Dosyayı görüntüle @ dd7df934
......@@ -57,9 +57,6 @@ CAccTextBase::~CAccTextBase()
*/
STDMETHODIMP CAccTextBase::get_addSelection(long startOffset, long endOffset)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK XInterface#
......@@ -94,9 +91,6 @@ STDMETHODIMP CAccTextBase::get_addSelection(long startOffset, long endOffset)
*/
STDMETHODIMP CAccTextBase::get_attributes(long offset, long * startOffset, long * endOffset, BSTR * textAttributes)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (startOffset == NULL || endOffset == NULL || textAttributes == NULL)
......@@ -217,9 +211,6 @@ STDMETHODIMP CAccTextBase::get_attributes(long offset, long * startOffset, long
*/
STDMETHODIMP CAccTextBase::get_caretOffset(long * offset)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (offset == NULL)
......@@ -244,9 +235,6 @@ STDMETHODIMP CAccTextBase::get_caretOffset(long * offset)
*/
STDMETHODIMP CAccTextBase::get_characterCount(long * nCharacters)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (nCharacters == NULL)
......@@ -275,9 +263,6 @@ STDMETHODIMP CAccTextBase::get_characterCount(long * nCharacters)
*/
STDMETHODIMP CAccTextBase::get_characterExtents(long offset, IA2CoordinateType coordType, long * x, long * y, long * width, long * height)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (x == NULL || height == NULL || y == NULL || width == NULL)
......@@ -348,9 +333,6 @@ STDMETHODIMP CAccTextBase::get_characterExtents(long offset, IA2CoordinateType c
*/
STDMETHODIMP CAccTextBase::get_nSelections(long * nSelections)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (nSelections == NULL)
......@@ -395,7 +377,6 @@ STDMETHODIMP CAccTextBase::get_nSelections(long * nSelections)
*/
STDMETHODIMP CAccTextBase::get_offsetAtPoint(long x, long y, IA2CoordinateType, long * offset)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (offset == NULL)
......@@ -423,9 +404,6 @@ STDMETHODIMP CAccTextBase::get_offsetAtPoint(long x, long y, IA2CoordinateType,
STDMETHODIMP CAccTextBase::get_selection(long selectionIndex, long * startOffset, long * endOffset)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (startOffset == NULL || endOffset == NULL )
......@@ -473,9 +451,6 @@ STDMETHODIMP CAccTextBase::get_selection(long selectionIndex, long * startOffset
*/
STDMETHODIMP CAccTextBase::get_text(long startOffset, long endOffset, BSTR * text)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (text == NULL)
......@@ -521,9 +496,6 @@ STDMETHODIMP CAccTextBase::get_text(long startOffset, long endOffset, BSTR * tex
*/
STDMETHODIMP CAccTextBase::get_textBeforeOffset(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -610,9 +582,6 @@ STDMETHODIMP CAccTextBase::get_textBeforeOffset(long offset, IA2TextBoundaryType
*/
STDMETHODIMP CAccTextBase::get_textAfterOffset(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (startOffset == NULL || endOffset == NULL || text == NULL)
......@@ -697,10 +666,6 @@ STDMETHODIMP CAccTextBase::get_textAfterOffset(long offset, IA2TextBoundaryType
*/
STDMETHODIMP CAccTextBase::get_textAtOffset(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (startOffset == NULL || text == NULL ||endOffset == NULL)
......@@ -783,9 +748,6 @@ STDMETHODIMP CAccTextBase::get_textAtOffset(long offset, IA2TextBoundaryType bou
*/
STDMETHODIMP CAccTextBase::removeSelection(long selectionIndex)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK XInterface#
......@@ -820,9 +782,6 @@ STDMETHODIMP CAccTextBase::removeSelection(long selectionIndex)
*/
STDMETHODIMP CAccTextBase::setCaretOffset(long offset)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK XInterface#
......@@ -846,9 +805,6 @@ STDMETHODIMP CAccTextBase::setCaretOffset(long offset)
*/
STDMETHODIMP CAccTextBase::setSelection(long, long startOffset, long endOffset)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK XInterface#
......@@ -871,9 +827,6 @@ STDMETHODIMP CAccTextBase::setSelection(long, long startOffset, long endOffset)
*/
STDMETHODIMP CAccTextBase::get_nCharacters(long * nCharacters)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (nCharacters == NULL)
......@@ -938,9 +891,6 @@ STDMETHODIMP CAccTextBase::scrollSubstringTo(long, long, IA2ScrollType)
*/
STDMETHODIMP CAccTextBase::put_XInterface(hyper pXInterface)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
CUNOXWrapper::put_XInterface(pXInterface);
......
winaccessibility/source/UAccCOM/AccValue.cxx
Dosyayı görüntüle @ dd7df934
......@@ -35,9 +35,6 @@ using namespace com::sun::star::uno;
STDMETHODIMP CAccValue::get_currentValue(VARIANT * currentValue)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (currentValue == NULL)
......@@ -63,9 +60,6 @@ STDMETHODIMP CAccValue::get_currentValue(VARIANT * currentValue)
*/
STDMETHODIMP CAccValue::setCurrentValue(VARIANT value)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if ( !pRXVal.is() )
......@@ -144,9 +138,6 @@ STDMETHODIMP CAccValue::setCurrentValue(VARIANT value)
*/
STDMETHODIMP CAccValue::get_maximumValue(VARIANT *maximumValue)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (maximumValue == NULL)
......@@ -171,9 +162,6 @@ STDMETHODIMP CAccValue::get_maximumValue(VARIANT *maximumValue)
*/
STDMETHODIMP CAccValue::get_minimumValue(VARIANT *mininumValue)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
if (mininumValue == NULL)
......
winaccessibility/source/UAccCOM/CheckEnableAccessible.h deleted 100644 → 0
Dosyayı görüntüle @ cbda6da0
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_CHECKENABLEACCESSIBLE_H
#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_CHECKENABLEACCESSIBLE_H
inline bool IsEnableAccessibleInterface() { return true; }
#define CHECK_ENABLE_INF if(!IsEnableAccessibleInterface()){ return S_FALSE; }
#define CHECK_ENABLE_INF_ZERO if(!IsEnableAccessibleInterface()){ return 0; }
#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_CHECKENABLEACCESSIBLE_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
winaccessibility/source/UAccCOM/EnumVariant.cxx
Dosyayı görüntüle @ dd7df934
......@@ -46,7 +46,6 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Next(ULONG cElements,VARIANT __RPC_FAR *
if (pvar == NULL)
return E_INVALIDARG;
CHECK_ENABLE_INF
if (pcElementFetched != NULL)
*pcElementFetched = 0;
......@@ -91,7 +90,6 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Next(ULONG cElements,VARIANT __RPC_FAR *
*/
HRESULT STDMETHODCALLTYPE CEnumVariant::Skip(ULONG cElements)
{
CHECK_ENABLE_INF
m_lCurrent += cElements;
if (m_lCurrent > (long)(m_lLBound+m_pXAccessibleSelection->getSelectedAccessibleChildCount()))
{
......@@ -169,8 +167,6 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Create(CEnumVariant __RPC_FAR *__RPC_FAR
*/
long CEnumVariant::GetCountOfElements()
{
CHECK_ENABLE_INF_ZERO
if(m_pXAccessibleSelection.is())
return m_pXAccessibleSelection->getSelectedAccessibleChildCount();
return 0;
......
winaccessibility/source/UAccCOM/MAccessible.cxx
Dosyayı görüntüle @ dd7df934
......@@ -284,8 +284,6 @@ CMAccessible::~CMAccessible()
*/
STDMETHODIMP CMAccessible::get_accParent(IDispatch **ppdispParent)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -321,8 +319,6 @@ STDMETHODIMP CMAccessible::get_accParent(IDispatch **ppdispParent)
*/
STDMETHODIMP CMAccessible::get_accChildCount(long *pcountChildren)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -355,8 +351,6 @@ STDMETHODIMP CMAccessible::get_accChildCount(long *pcountChildren)
*/
STDMETHODIMP CMAccessible::get_accChild(VARIANT varChild, IDispatch **ppdispChild)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -391,8 +385,6 @@ STDMETHODIMP CMAccessible::get_accChild(VARIANT varChild, IDispatch **ppdispChil
*/
STDMETHODIMP CMAccessible::get_accName(VARIANT varChild, BSTR *pszName)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -430,8 +422,6 @@ STDMETHODIMP CMAccessible::get_accName(VARIANT varChild, BSTR *pszName)
*/
STDMETHODIMP CMAccessible::get_accValue(VARIANT varChild, BSTR *pszValue)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -475,8 +465,6 @@ STDMETHODIMP CMAccessible::get_accValue(VARIANT varChild, BSTR *pszValue)
*/
STDMETHODIMP CMAccessible::get_accDescription(VARIANT varChild, BSTR *pszDescription)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -514,8 +502,6 @@ STDMETHODIMP CMAccessible::get_accDescription(VARIANT varChild, BSTR *pszDescrip
*/
STDMETHODIMP CMAccessible::get_accRole(VARIANT varChild, VARIANT *pvarRole)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -565,8 +551,6 @@ STDMETHODIMP CMAccessible::get_accRole(VARIANT varChild, VARIANT *pvarRole)
*/
STDMETHODIMP CMAccessible::get_accState(VARIANT varChild, VARIANT *pvarState)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -669,8 +653,6 @@ static void GetMnemonicChar( const ::rtl::OUString& aStr, WCHAR* wStr)
*/
STDMETHODIMP CMAccessible::get_accKeyboardShortcut(VARIANT varChild, BSTR *pszKeyboardShortcut)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
......@@ -824,8 +806,6 @@ STDMETHODIMP CMAccessible::get_accKeyboardShortcut(VARIANT varChild, BSTR *pszKe
*/
STDMETHODIMP CMAccessible::get_accFocus(VARIANT *pvarChild)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -863,8 +843,6 @@ STDMETHODIMP CMAccessible::get_accFocus(VARIANT *pvarChild)
*/
STDMETHODIMP CMAccessible::get_accSelection(VARIANT *pvarChildren)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -912,8 +890,6 @@ STDMETHODIMP CMAccessible::get_accSelection(VARIANT *pvarChildren)
*/
STDMETHODIMP CMAccessible::accLocation(long *pxLeft, long *pyTop, long *pcxWidth, long *pcyHeight, VARIANT varChild)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -970,8 +946,6 @@ STDMETHODIMP CMAccessible::accLocation(long *pxLeft, long *pyTop, long *pcxWidth
*/
STDMETHODIMP CMAccessible::accNavigate(long navDir, VARIANT varStart, VARIANT *pvarEndUpAt)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -1012,8 +986,6 @@ STDMETHODIMP CMAccessible::accNavigate(long navDir, VARIANT varStart, VARIANT *p
STDMETHODIMP CMAccessible::accHitTest(long xLeft, long yTop, VARIANT *pvarChild)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -1678,8 +1650,6 @@ HRESULT CMAccessible::GetPreSibling(VARIANT varStart,VARIANT* pvarEndUpAt)
*/
STDMETHODIMP CMAccessible::get_nRelations( long __RPC_FAR *nRelations)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -1708,8 +1678,6 @@ STDMETHODIMP CMAccessible::get_nRelations( long __RPC_FAR *nRelations)
STDMETHODIMP CMAccessible::get_relation( long relationIndex, IAccessibleRelation __RPC_FAR *__RPC_FAR *relation)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -1771,8 +1739,6 @@ STDMETHODIMP CMAccessible::get_relation( long relationIndex, IAccessibleRelation
STDMETHODIMP CMAccessible::get_relations( long, IAccessibleRelation __RPC_FAR *__RPC_FAR *relation, long __RPC_FAR *nRelations)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
// #CHECK#
......@@ -1915,8 +1881,6 @@ static XAccessible* getTheParentOfMember(XAccessible* pXAcc)
STDMETHODIMP CMAccessible:: get_groupPosition(long __RPC_FAR *groupLevel,long __RPC_FAR *similarItemsInGroup,long __RPC_FAR *positionInGroup)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -2091,8 +2055,6 @@ STDMETHODIMP CMAccessible:: get_groupPosition(long __RPC_FAR *groupLevel,long __
STDMETHODIMP CMAccessible:: get_extendedStates( long, BSTR __RPC_FAR *__RPC_FAR *, long __RPC_FAR *)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
......@@ -2318,8 +2280,6 @@ STDMETHODIMP CMAccessible::SetXAccessible(hyper pXAcc)
*/
STDMETHODIMP CMAccessible::accSelect(long flagsSelect, VARIANT varChild)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
if( (flagsSelect&SELFLAG_ADDSELECTION) &&
......@@ -3079,8 +3039,6 @@ STDMETHODIMP CMAccessible::Get_XAccChildID(long* childID)
}
STDMETHODIMP CMAccessible:: get_states(AccessibleStates __RPC_FAR *states )
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
......@@ -3118,8 +3076,6 @@ STDMETHODIMP CMAccessible:: get_states(AccessibleStates __RPC_FAR *states )
// return the UNO roles
STDMETHODIMP CMAccessible:: get_extendedRole( BSTR __RPC_FAR * )
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
......@@ -3139,8 +3095,6 @@ STDMETHODIMP CMAccessible:: get_localizedExtendedRole( BSTR __RPC_FAR * )
}
STDMETHODIMP CMAccessible:: get_nExtendedStates( long __RPC_FAR * )
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
......@@ -3163,8 +3117,6 @@ STDMETHODIMP CMAccessible:: get_localizedExtendedStates( long, BSTR __RPC_FAR *_
STDMETHODIMP CMAccessible:: get_indexInParent( long __RPC_FAR *accParentIndex)
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
// #CHECK#
......@@ -3182,8 +3134,6 @@ STDMETHODIMP CMAccessible:: get_indexInParent( long __RPC_FAR *accParentIndex)
}
STDMETHODIMP CMAccessible:: get_locale( IA2Locale __RPC_FAR *locale )
{
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
ISDESTROY()
if(locale == NULL)
......@@ -3304,7 +3254,6 @@ STDMETHODIMP CMAccessible:: get_toolkitVersion(BSTR __RPC_FAR *version)
STDMETHODIMP CMAccessible::get_attributes(/*[out]*/ BSTR *pAttr)
{
CHECK_ENABLE_INF
Reference<XAccessibleContext> pRContext = m_xAccessible->getAccessibleContext();
if( !pRContext.is() )
{
......
winaccessibility/source/UAccCOM/stdafx.h
Dosyayı görüntüle @ dd7df934
......@@ -51,7 +51,6 @@ extern CComModule _Module;
#include <windows.h>
#undef OPAQUE
#include "CheckEnableAccessible.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment