8 files changed, 32 insertions, 29 deletions
diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx
index 178017e62de7..178017e62de7 100644..100755
--- a/winaccessibility/source/UAccCOM/UAccCOM.cxx
+++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx
diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx
index 0b3f720379a2..df2a42c7967e 100644..100755
--- a/winaccessibility/source/service/AccEventListener.cxx
+++ b/winaccessibility/source/service/AccEventListener.cxx
@@ -188,7 +188,7 @@ void AccEventListener::fireStateFocusdChange(bool enable)
  *  @param state    the state id
  *  @param set      true if state is set, false if state is unset
  */
-void AccEventListener::fireStatePropertyChange(short state, bool set )
+void AccEventListener::fireStatePropertyChange(short /*state*/, bool set )
 {
     if( set )
     {
@@ -231,7 +231,7 @@ void AccEventListener::removeMeFromBroadcaster()
 {
     try
     {
-        vos::OGuard aGuard(aRemoveMutex);
+        osl::MutexGuard aGuard(aRemoveMutex);
         if(m_isDisposed)
             return;
         //get accessible context
@@ -259,7 +259,7 @@ void AccEventListener::removeMeFromBroadcaster()
         if (pBroadcaster != NULL)
         {
             //remove the lister from accessible object
-            pBroadcaster->removeEventListener(this);
+            pBroadcaster->removeAccessibleEventListener(this);
             m_isDisposed = true;
             pAgent->NotifyDestroy(pAccessible);
         }
@@ -274,7 +274,7 @@ void AccEventListener::removeMeFromBroadcaster()
 /**
  *  this method is invoked before listener is disposed
  */
-void AccEventListener::disposing( const ::com::sun::star::lang::EventObject& Source )
+void AccEventListener::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ )
 throw (::com::sun::star::uno::RuntimeException)
 {
     removeMeFromBroadcaster();
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx
index c3627e3dc951..a57fc3c52ba8 100644..100755
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -33,7 +33,8 @@ using namespace com::sun::star::accessibility;
 #include <vcl/window.hxx>
 #include <toolkit/awt/Vclxwindow.hxx>
 
-#ifndef _SV_SYSDATA_HXX
+//#ifndef _SV_SYSDATA_HXX
+#if 0
 #if defined( WIN ) || defined( WNT ) || defined( OS2 )
 typedef sal_Int32 HWND;
 typedef sal_Int32 HMENU;
@@ -42,9 +43,9 @@ typedef void *PVOID;
 typedef PVOID HANDLE;
 typedef HANDLE HFONT;
 #endif
-#include <vcl/sysdata.hxx>
 #endif
-
+#include <vcl/sysdata.hxx>
+//#endif
 
 AccFrameEventListener::AccFrameEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
         :AccEventListener(pAcc, Agent)
@@ -115,7 +116,8 @@ void AccFrameEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
             const SystemEnvData* systemdata=window->GetSystemData();
 
             //add this child
-            pAgent->InsertAccObj( pAcc,pAccessible,(HWND)systemdata->hWnd);
+            //TODO(davido): FixMe
+            pAgent->InsertAccObj( pAcc,pAccessible,(long)(HWND)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 84a7456ac740..4ed41d68c7a7 100644..100755
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -133,7 +133,7 @@ AccObjectWinManager::~AccObjectWinManager()
 
 long AccObjectWinManager::Get_ToATInterface( HWND hWnd, long lParam, long wParam)
 {
-    vos::OGuard localGuard(maATInterfaceMutex);//
+    osl::MutexGuard localGuard(maATInterfaceMutex);//
 
     IMAccessible* pRetIMAcc = NULL;
 
@@ -215,7 +215,7 @@ AccObject* AccObjectWinManager::GetTopWindowAccObj(HWND hWnd)
    */
 sal_Bool AccObjectWinManager::NotifyAccEvent(XAccessible* pXAcc,short state)
 {
-    vos::OGuard aGuard(aNotifyMutex);
+    osl::MutexGuard aGuard(aNotifyMutex);
 
     if (!IsInMainThread())
     {
@@ -563,7 +563,7 @@ void AccObjectWinManager::DeleteFromHwndXAcc(XAccessible* pXAcc )
    */
 void AccObjectWinManager::DeleteChildrenAccObj(XAccessible* pXAcc)
 {
-    vos::OGuard aGuard( aDeleteMutex );
+    osl::MutexGuard aGuard( aDeleteMutex );
     AccObject* currentObj=NULL;
     AccObject* childObj=NULL;
     XAccessible* pTmpXAcc=NULL;
@@ -592,7 +592,7 @@ void AccObjectWinManager::DeleteChildrenAccObj(XAccessible* pXAcc)
    */
 void AccObjectWinManager::DeleteAccObj( XAccessible* pXAcc )
 {
-    vos::OGuard aGuard( aDeleteMutex );
+    osl::MutexGuard aGuard( aDeleteMutex );
     if( pXAcc == NULL )
         return;
     XIdToAccObjHash::iterator temp = XIdAccList.find(pXAcc);
@@ -792,7 +792,7 @@ sal_Bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pPar
             static_cast< XAccessibleEventListener* >(listener),UNO_QUERY );
         if(pp.is())
         {
-            broadcaster->addEventListener(pp);
+            broadcaster->addAccessibleEventListener(pp);
         }
         else
         {
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx
index 7e1de22e9c63..28d2b7930ead 100644..100755
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -23,7 +23,8 @@
 #include <vcl/window.hxx>
 #include <toolkit/awt/Vclxwindow.hxx>
 
-#ifndef _SV_SYSDATA_HXX
+//#ifndef _SV_SYSDATA_HXX
+#if 0
 #if defined( WIN ) || defined( WNT ) || defined( OS2 )
 typedef sal_Int32 HWND;
 typedef sal_Int32 HMENU;
@@ -32,8 +33,8 @@ typedef void *PVOID;
 typedef PVOID HANDLE;
 typedef HANDLE HFONT;
 #endif
-#include <vcl/sysdata.hxx>
 #endif
+#include <vcl/sysdata.hxx>
 
 #include "AccTopWindowListener.hxx"
 #include "unomsaaevent.hxx"
@@ -105,7 +106,7 @@ void AccTopWindowListener::handleWindowOpened( com::sun::star::accessibility::XA
     //Only AccessibleContext exist, add all listeners
     if(pAccessibleContext != NULL && systemdata != NULL)
     {
-        accManagerAgent.SaveTopWindowHandle((HWND)systemdata->hWnd,  pAccessible);
+      accManagerAgent.SaveTopWindowHandle((long)(HWND)systemdata->hWnd,  pAccessible);
 
         AddAllListeners(pAccessible,NULL,(HWND)systemdata->hWnd);
 
@@ -181,7 +182,7 @@ void AccTopWindowListener::AddAllListeners(com::sun::star::accessibility::XAcces
         return;
     }
 
-    accManagerAgent.InsertAccObj( pAccessible, pParentXAcc,pWND );
+    accManagerAgent.InsertAccObj( pAccessible, pParentXAcc,(long)(HWND)pWND );
 
     if (!accManagerAgent.IsContainer(pAccessible))
     {
@@ -220,7 +221,7 @@ void AccTopWindowListener::AddAllListeners(com::sun::star::accessibility::XAcces
     }
 }
 
-void AccTopWindowListener::windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException)
+void AccTopWindowListener::windowClosing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
 {
 }
 
diff --git a/winaccessibility/source/service/checkmt.cxx b/winaccessibility/source/service/checkmt.cxx
index f5e89aa86f15..ad0f2b770647 100644..100755
--- a/winaccessibility/source/service/checkmt.cxx
+++ b/winaccessibility/source/service/checkmt.cxx
@@ -22,13 +22,13 @@
 
 bool IsInMainThread()
 {
-    if( Application::GetMainThreadIdentifier() == ::vos::OThread::getCurrentIdentifier())
+    if( Application::GetMainThreadIdentifier() == osl::Thread::getCurrentIdentifier())
         return true;
     else
         return false;
 }
 
-vos::IMutex& GetSolarMutex()
+comphelper::SolarMutex& GetSolarMutex()
 {
     return Application::GetSolarMutex();
 }
diff --git a/winaccessibility/source/service/checkmt.hxx b/winaccessibility/source/service/checkmt.hxx
index c70f380b0286..bc5b757a7a8c 100644..100755
--- a/winaccessibility/source/service/checkmt.hxx
+++ b/winaccessibility/source/service/checkmt.hxx
@@ -19,10 +19,10 @@
 
 #pragma once
 
-#include <vos/mutex.hxx>
+#include "comphelper/solarmutex.hxx"
 
 bool IsInMainThread();
 
-vos::IMutex&  GetSolarMutex();
+comphelper::SolarMutex& GetSolarMutex();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx
index c51b79bc36e4..860606908e4b 100644..100755
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -49,11 +49,11 @@ extern void handleWindowOpened_impl( long pAcc);
 namespace my_sc_impl
 {
 
-extern Sequence< OUString > SAL_CALL  getSupportedServiceNames_MSAAServiceImpl();
-extern OUString SAL_CALL getImplementationName_MSAAServiceImpl();
-extern Reference< XInterface > SAL_CALL create_MSAAServiceImpl(
-        Reference< XComponentContext > const & xContext )
-    SAL_THROW( () );
+  //extern Sequence< OUString > SAL_CALL  getSupportedServiceNames_MSAAServiceImpl();
+  //static OUString SAL_CALL getImplementationName_MSAAServiceImpl();
+  //static Reference< XInterface > SAL_CALL create_MSAAServiceImpl(
+  //      Reference< XComponentContext > const & xContext )
+  //  SAL_THROW( () );
 /**
    * Method that returns the service name.
    * @param
@@ -272,12 +272,12 @@ static struct ::cppu::ImplementationEntry s_component_entries [] =
 
 extern "C"
 {
-    void SAL_CALL component_getImplementationEnvironment(
+    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
         sal_Char const ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
     {
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
-    void * SAL_CALL component_getFactory(
+    SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
         sal_Char const * implName, lang::XMultiServiceFactory * xMgr,
         registry::XRegistryKey * xRegistry )
     {