winaccessibility: fix even more pointless HWND to long casting

Change-Id: I16a39a0dde27b17f1467a9605a4566b05f53a485

5 files changed, 14 insertions, 13 deletions

diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx
index 2b2055822b02..41ae6a267c0c 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -52,7 +52,7 @@ private:
     typedef std::map<HWND, void*> XHWNDToXAccHash;
     typedef std::map<const long, AccObject*> XResIdToAccObjHash;
 
-    typedef std::map<const long, com::sun::star::accessibility::XAccessible* >
+    typedef std::map<const HWND, com::sun::star::accessibility::XAccessible* >
         XHWNDToDocumentHash;
 
     //XAccessible to AccObject
@@ -83,7 +83,7 @@ private:
 
     AccObject* GetTopWindowAccObj(HWND hWnd);
 
-    com::sun::star::accessibility::XAccessible* GetAccDocByHWND( long pWnd );
+    com::sun::star::accessibility::XAccessible* GetAccDocByHWND(HWND hWnd);
 
     void       DeleteAccListener( AccObject* pAccObj );
     void       InsertAccChildNode(AccObject* pCurObj,AccObject* pParentObj,HWND pWnd);
diff --git a/winaccessibility/source/UAccCOM/EnumVariant.cxx b/winaccessibility/source/UAccCOM/EnumVariant.cxx
index 0eaa4860f0e3..f588dd2e7bb0 100644
--- a/winaccessibility/source/UAccCOM/EnumVariant.cxx
+++ b/winaccessibility/source/UAccCOM/EnumVariant.cxx
@@ -68,7 +68,7 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Next(ULONG cElements,VARIANT __RPC_FAR *
         else if(pRXAcc.is())
         {
             if(CMAccessible::g_pAgent)
-                CMAccessible::g_pAgent->InsertAccObj(pRXAcc.get(),pUNOInterface,NULL);
+                CMAccessible::g_pAgent->InsertAccObj(pRXAcc.get(),pUNOInterface);
             BOOL isGet = CMAccessible::get_IAccessibleFromXAccessible(
                             pRXAcc.get(), &pChild);
             if(isGet)
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx
index c9ef5a85d371..98d7b41248c6 100644
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -91,8 +91,8 @@ void AccFrameEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
             const SystemEnvData* systemdata=window->GetSystemData();
 
             //add this child
-            //TODO(davido): FixMe
-            pAgent->InsertAccObj( pAcc,pAccessible,(long)(HWND)systemdata->hWnd);
+            pAgent->InsertAccObj(pAcc, pAccessible,
+                    reinterpret_cast<sal_Int64>(systemdata->hWnd));
             //add all oldValue's existing children
             pAgent->InsertChildrenAccObj(pAcc);
             pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx
index 88d31a8b0567..5773a631a998 100644
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -771,13 +771,12 @@ sal_Bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pPar
     //for file name support
     if ( pObj.GetRole() == DOCUMENT )
     {
-        XHWNDToDocumentHash::iterator aIter = XHWNDDocList.find( (long)pWnd );
+        XHWNDToDocumentHash::iterator aIter = XHWNDDocList.find(pWnd);
         if ( aIter != XHWNDDocList.end() )
         {
             XHWNDDocList.erase( aIter );
         }
-        XHWNDDocList.insert( XHWNDToDocumentHash::value_type( (long)pWnd, pXAcc ) );
-
+        XHWNDDocList.insert( XHWNDToDocumentHash::value_type(pWnd, pXAcc) );
     }
     //end of file name
 
@@ -1288,7 +1287,7 @@ short AccObjectWinManager::GetRole(com::sun::star::accessibility::XAccessible* p
     return -1;
 }
 
-XAccessible* AccObjectWinManager::GetAccDocByHWND( long pWnd )
+XAccessible* AccObjectWinManager::GetAccDocByHWND(HWND pWnd)
 {
     XHWNDToDocumentHash::iterator aIter;
     aIter = XHWNDDocList.find( pWnd );
@@ -1303,8 +1302,8 @@ XAccessible* AccObjectWinManager::GetAccDocByHWND( long pWnd )
 XAccessible* AccObjectWinManager::GetAccDocByAccTopWin( XAccessible* pXAcc )
 {
     AccObject* pAccObj = GetAccObjByXAcc( pXAcc );
-    long pWnd = (long)( pAccObj->GetParentHWND() );
-    return GetAccDocByHWND( pWnd );
+    HWND hWnd = pAccObj->GetParentHWND();
+    return GetAccDocByHWND(hWnd);
 }
 
 bool AccObjectWinManager::IsTopWinAcc( com::sun::star::accessibility::XAccessible* pXAcc )
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx
index a463ca4ec5a5..ca8a1c01b606 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -72,7 +72,8 @@ void AccTopWindowListener::HandleWindowOpened( com::sun::star::accessibility::XA
     //Only AccessibleContext exist, add all listeners
     if(pAccessibleContext != NULL && systemdata != NULL)
     {
-        accManagerAgent.SaveTopWindowHandle((long)(HWND)systemdata->hWnd, pAccessible);
+        accManagerAgent.SaveTopWindowHandle(
+                reinterpret_cast<sal_Int64>(systemdata->hWnd), pAccessible);
 
         AddAllListeners(pAccessible,NULL,(HWND)systemdata->hWnd);
 
@@ -145,7 +146,8 @@ void AccTopWindowListener::AddAllListeners(com::sun::star::accessibility::XAcces
         return;
     }
 
-    accManagerAgent.InsertAccObj( pAccessible, pParentXAcc,(long)(HWND)pWND );
+    accManagerAgent.InsertAccObj(pAccessible, pParentXAcc,
+            reinterpret_cast<sal_Int64>(pWND));
 
     if (!accManagerAgent.IsContainer(pAccessible))
     {