diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:22:02 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:56:10 -0500 |
| commit | ab25f5f512cb18e0aaaef5c83b1adbcaa6cde921 (patch) | |
| tree | 8e6b346d3c681ae97fb5843b7b29c7fe157dda98 /sw/source/ui/inc/unodispatch.hxx | |
| parent | merge vosremoval-reference.diff (diff) | |
| download | core-ab25f5f512cb18e0aaaef5c83b1adbcaa6cde921.tar.gz core-ab25f5f512cb18e0aaaef5c83b1adbcaa6cde921.zip | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'sw/source/ui/inc/unodispatch.hxx')
| -rw-r--r-- | sw/source/ui/inc/unodispatch.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx index f975ac07a69b..56b930b6fead 100644 --- a/sw/source/ui/inc/unodispatch.hxx +++ b/sw/source/ui/inc/unodispatch.hxx @@ -36,7 +36,7 @@ #include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase3.hxx> #include <list> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> class SwView; @@ -50,7 +50,7 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3 class DispatchMutexLock_Impl { //::osl::MutexGuard aGuard; #102295# solar mutex has to be used currently - vos::OGuard aGuard; + osl::SolarMutexGuard aGuard; DispatchMutexLock_Impl(); public: DispatchMutexLock_Impl(SwXDispatchProviderInterceptor&); |