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

winaccessibility: remove GetXAccByAccObj()

Browse Source 
It is pointlessly slow and the AccObject has a method for that.

Change-Id: I7ba1cc853255ac3b3b5008657d1cc79efc3a3f4b
This commit is contained in:
Michael Stahl
2013-11-26 23:29:50 +01:00
parent a2afe344c6
commit e094d6fab6
4 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
winaccessibility/inc/AccObject.hxx
View File

@@ -79,7 +79,8 @@ public:
void UpdateDefaultAction(); void UpdateDefaultAction();
IMAccessible* GetIMAccessible(); //return COM interface in acc object IMAccessible* GetIMAccessible(); //return COM interface in acc object
::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > GetXAccessible(); ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible> const& GetXAccessible();
void SetResID(long id);//ResID means ChildID in MSAA void SetResID(long id);//ResID means ChildID in MSAA
long GetResID(); long GetResID();

2
winaccessibility/inc/AccObjectWinManager.hxx
View File

@@ -78,8 +78,6 @@ private:
long ImpleGenerateResID(); long ImpleGenerateResID();
AccObject* GetAccObjByXAcc( com::sun::star::accessibility::XAccessible* pXAcc); AccObject* GetAccObjByXAcc( com::sun::star::accessibility::XAccessible* pXAcc);
com::sun::star::accessibility::XAccessible* GetXAccByAccObj(AccObject* pAccObj);
AccObject* GetTopWindowAccObj(HWND hWnd); AccObject* GetTopWindowAccObj(HWND hWnd);
com::sun::star::accessibility::XAccessible* GetAccDocByHWND(HWND hWnd); com::sun::star::accessibility::XAccessible* GetAccDocByHWND(HWND hWnd);

2
winaccessibility/source/service/AccObject.cxx
View File

@@ -1152,7 +1152,7 @@ IMAccessible* AccObject::GetIMAccessible()
return m_pIMAcc; return m_pIMAcc;
} }
Reference < XAccessible > AccObject::GetXAccessible() Reference<XAccessible> const& AccObject::GetXAccessible()
{ {
return m_xAccRef; return m_xAccRef;
} }

21
winaccessibility/source/service/AccObjectWinManager.cxx
View File

@@ -172,24 +172,6 @@ AccObject* AccObjectWinManager::GetAccObjByXAcc( XAccessible* pXAcc)
return &(pIndTemp->second); return &(pIndTemp->second);
} }
/**
* Search XAccessible by AccObject pointer from our container.
* @param pAccObj AccObject pointer.
* @return Pointer of XAccessible Interface.
*/
XAccessible* AccObjectWinManager::GetXAccByAccObj(AccObject* pAccObj)
{
XIdToAccObjHash::iterator iter = XIdAccList.begin();
while(iter!=XIdAccList.end())
{
AccObject* tmp = &(iter->second);
if(tmp== pAccObj)
return (XAccessible*)(iter->first);
++iter;
}
return NULL;
}
/** /**
* get acc object of top window by its handle * get acc object of top window by its handle
* @param hWnd, top window handle * @param hWnd, top window handle
@@ -563,7 +545,6 @@ void AccObjectWinManager::DeleteChildrenAccObj(XAccessible* pXAcc)
{ {
AccObject* currentObj=NULL; AccObject* currentObj=NULL;
AccObject* childObj=NULL; AccObject* childObj=NULL;
XAccessible* pTmpXAcc=NULL;
currentObj = GetAccObjByXAcc( pXAcc); currentObj = GetAccObjByXAcc( pXAcc);
if(currentObj) if(currentObj)
@@ -571,7 +552,7 @@ void AccObjectWinManager::DeleteChildrenAccObj(XAccessible* pXAcc)
childObj = currentObj->NextChild(); childObj = currentObj->NextChild();
while(childObj) while(childObj)
{ {
pTmpXAcc = GetXAccByAccObj(childObj); XAccessible *const pTmpXAcc = childObj->GetXAccessible().get();
if(pTmpXAcc) if(pTmpXAcc)
{ {
DeleteChildrenAccObj(pTmpXAcc); DeleteChildrenAccObj(pTmpXAcc);