diff options
author | David Ostrovsky <david@ostrovsky.org> | 2013-11-02 20:40:47 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2013-11-19 10:02:24 +0000 |
commit | cbf2a0d90cc9e2efb31aabd1d2db2acce76d21c7 (patch) | |
tree | 8596b44a5c55abdc29dd831ed8c161e403bca42d /winaccessibility/inc | |
parent | 026a7dc3856fbdbdda30bc6d30610b389293953b (diff) |
Gbuildify winaccessibility service
Conflicts:
winaccessibility/source/UAccCOM/UAccCOM.def
winaccessibility/source/service/AccObjectWinManager.cxx
winaccessibility/source/service/checkmt.cxx
winaccessibility/source/service/checkmt.hxx
Change-Id: Ia66872bee7c70c840c1bd5caa626bf63eac9ef7c
Diffstat (limited to 'winaccessibility/inc')
-rwxr-xr-x[-rw-r--r--] | winaccessibility/inc/AccEventListener.hxx | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | winaccessibility/inc/AccObjectWinManager.hxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx index 06801da27187..5978dddddd43 100644..100755 --- a/winaccessibility/inc/AccEventListener.hxx +++ b/winaccessibility/inc/AccEventListener.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/accessibility/XAccessibleEventListener.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> #include <cppuhelper/weak.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> class AccObjectManagerAgent; using namespace ::com::sun::star::uno; @@ -45,7 +45,7 @@ protected: AccObjectManagerAgent* pAgent; //disposed state indicator bool m_isDisposed; - mutable ::vos::OMutex aRemoveMutex; + mutable ::osl::Mutex aRemoveMutex; public: AccEventListener( com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); virtual ~AccEventListener(); diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx index 945e86c44eda..800c9279bffa 100644..100755 --- a/winaccessibility/inc/AccObjectWinManager.hxx +++ b/winaccessibility/inc/AccObjectWinManager.hxx @@ -25,7 +25,7 @@ #endif #include <map> #include <windows.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/dllapi.h> #include "ResIDGenerator.hxx" #include "UAccCOM2.h" @@ -93,9 +93,9 @@ private: AccObjectManagerAgent* pAgent; static AccObjectWinManager* me; ResIDGenerator ResIdGen; - mutable ::vos::OMutex aDeleteMutex; - mutable ::vos::OMutex aNotifyMutex; - mutable ::vos::OMutex maATInterfaceMutex; + mutable ::osl::Mutex aDeleteMutex; + mutable ::osl::Mutex aNotifyMutex; + mutable ::osl::Mutex maATInterfaceMutex; AccObjectWinManager(AccObjectManagerAgent* Agent=NULL); |