mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Typo decendant => descendant in winaccessibility/MAccessible

Browse Source 
Change-Id: I2e49ab149b2bbdad623f8694221b6169cdfd2d9a
This commit is contained in:
Julien Nabet
2014-01-27 23:46:25 +01:00
parent 35782f89b6
commit c1503da35d
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
winaccessibility/source/UAccCOM/MAccessible.cxx
View File

@@ -137,7 +137,7 @@ BSTR IA2_STATES_NAME[] =
_T("Horizontal"), _T("Horizontal"),
_T("Iconified"), _T("Iconified"),
_T("Invalid Entry"), _T("Invalid Entry"),
_T("Manages Decendents"), _T("Manages Descendants"),
_T("Modal"), _T("Modal"),
_T("Multi Line"), _T("Multi Line"),
_T("Opaque"), _T("Opaque"),
@@ -1468,18 +1468,18 @@ IMAccessible* CMAccessible::GetChildInterface(long dChildID)//for test
} }
/** /**
* For List, tree and table,these roles belong to manage_decendant in UNO, * For List, tree and table,these roles belong to manage_descendant in UNO,
* need to process specifically when navigate * need to process specifically when navigate
* @return BOOL, if it is decendantmanager, return true. * @return BOOL, if it is descendantmanager, return true.
*/ */
BOOL CMAccessible::IsDecendantManage() BOOL CMAccessible::IsDescendantManage()
{ {
return (m_iRole==ROLE_SYSTEM_LIST)||(m_iRole==ROLE_SYSTEM_OUTLINE)||(m_iRole==ROLE_SYSTEM_TABLE); return (m_iRole==ROLE_SYSTEM_LIST)||(m_iRole==ROLE_SYSTEM_OUTLINE)||(m_iRole==ROLE_SYSTEM_TABLE);
} }
/** /**
* for decendantmanager circumstance,provide child interface when navigate * for descendantmanager circumstance,provide child interface when navigate
* @param varCur, the current child. * @param varCur, the current child.
* @param flags, the navigation direction. * @param flags, the navigation direction.
* @return IMAccessible*, the child of the end up node. * @return IMAccessible*, the child of the end up node.
@@ -1558,7 +1558,7 @@ IMAccessible* CMAccessible::GetNavigateChildForDM(VARIANT varCur, short flags)
/** /**
* Return first child for parent container, process differently according * Return first child for parent container, process differently according
* to whether it is decendant manage * to whether it is descendant manage
* @param varStart, the start child id of this navigation action. * @param varStart, the start child id of this navigation action.
* @param pvarEndUpAt, [in,out] the end up child of this navigation action. * @param pvarEndUpAt, [in,out] the end up child of this navigation action.
* @return S_OK if successful and E_FAIL if failure. * @return S_OK if successful and E_FAIL if failure.
@@ -1595,7 +1595,7 @@ HRESULT CMAccessible::GetFirstChild(VARIANT varStart,VARIANT* pvarEndUpAt)
/** /**
* Return last child for parent container, process differently according * Return last child for parent container, process differently according
* to whether it is decendant manage * to whether it is descendant manage
* @param varStart, the start child id of this navigation action. * @param varStart, the start child id of this navigation action.
* @param pvarEndUpAt, [in,out] the end up child of this navigation action. * @param pvarEndUpAt, [in,out] the end up child of this navigation action.
* @return S_OK if successful and E_FAIL if failure. * @return S_OK if successful and E_FAIL if failure.
@@ -1630,7 +1630,7 @@ HRESULT CMAccessible::GetLastChild(VARIANT varStart,VARIANT* pvarEndUpAt)
} }
/** /**
* The method GetNextSibling is general, whatever it is decendant manage or not * The method GetNextSibling is general, whatever it is descendant manage or not
* Get the next sibling object. * Get the next sibling object.
* @param varStart, the start child id of this navigation action. * @param varStart, the start child id of this navigation action.
* @param pvarEndUpAt, [in,out] the end up child of this navigation action. * @param pvarEndUpAt, [in,out] the end up child of this navigation action.
@@ -1666,7 +1666,7 @@ HRESULT CMAccessible::GetNextSibling(VARIANT varStart,VARIANT* pvarEndUpAt)
} }
/** /**
*the method GetPreSibling is general, whatever it is decendant manage or not *the method GetPreSibling is general, whatever it is descendant manage or not
* @param varStart, the start child id of this navigation action. * @param varStart, the start child id of this navigation action.
* @param pvarEndUpAt, [in,out] the end up child of this navigation action. * @param pvarEndUpAt, [in,out] the end up child of this navigation action.
* @return S_OK if successful and E_FAIL if failure. * @return S_OK if successful and E_FAIL if failure.

6
winaccessibility/source/UAccCOM/MAccessible.h
View File

@@ -197,12 +197,12 @@ private:
// the helper methods in order to implement the above public methods // the helper methods in order to implement the above public methods
IMAccessible* GetChildInterface(long dChildIndex);//notice here the parameter is child index,not child id IMAccessible* GetChildInterface(long dChildIndex);//notice here the parameter is child index,not child id
IMAccessible* GetNavigateChildForDM(VARIANT varCur,short flags);//for decendant manage IMAccessible* GetNavigateChildForDM(VARIANT varCur,short flags);//for descendant manage
HRESULT GetFirstChild(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation HRESULT GetFirstChild(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation
HRESULT GetLastChild(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation HRESULT GetLastChild(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation
HRESULT GetNextSibling(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation HRESULT GetNextSibling(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation
HRESULT GetPreSibling(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation HRESULT GetPreSibling(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation
BOOL IsDecendantManage();//identify whether the current COM belongs to manage_decendant roles BOOL IsDescendantManage();//identify whether the current COM belongs to manage_descendant roles
// the following private methods are used to implement accSelect method // the following private methods are used to implement accSelect method
HRESULT SelectChild(css::accessibility::XAccessible* pItem); HRESULT SelectChild(css::accessibility::XAccessible* pItem);
@@ -222,7 +222,7 @@ private:
public: public:
STDMETHOD(Get_XAccChildID)(/*[out,retval]*/ long* childID); STDMETHOD(Get_XAccChildID)(/*[out,retval]*/ long* childID);
// AccObjectManagerAgent is a management object in UNO, here keep its pointer for // AccObjectManagerAgent is a management object in UNO, here keep its pointer for
// the implementation of accNavigate when decendant manage happens for List,Tree, or Table // the implementation of accNavigate when descendant manage happens for List,Tree, or Table
// AccObjectManagerAgent and the following UNO objects XAccessble,XAccessibleSelection, // AccObjectManagerAgent and the following UNO objects XAccessble,XAccessibleSelection,
// XAccessibleAction are all used to operate UNO accessiblility information directly when // XAccessibleAction are all used to operate UNO accessiblility information directly when
// implement some specific MSAA methods,such as accSelection,accNavigate // implement some specific MSAA methods,such as accSelection,accNavigate