sw/source/core/uibase/inc/unodispatch.hxx | 4 ++-- sw/source/core/uibase/uno/unodispatch.cxx | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit 80cb53408655ed325aeec0fd65398dfc728da253 Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Mar 20 21:35:53 2014 +0100 simplify Change-Id: Ifb801f04845934ce98f346bd46a81e9bf9d0ba89 diff --git a/sw/source/core/uibase/inc/unodispatch.hxx b/sw/source/core/uibase/inc/unodispatch.hxx index f5992c1..eced0ec 100644 --- a/sw/source/core/uibase/inc/unodispatch.hxx +++ b/sw/source/core/uibase/inc/unodispatch.hxx @@ -27,7 +27,7 @@ #include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase3.hxx> #include <list> -#include <comphelper/solarmutex.hxx> +#include <vcl/svapp.hxx> #include <osl/mutex.hxx> class SwView; @@ -42,7 +42,7 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3 class DispatchMutexLock_Impl { //::osl::MutexGuard aGuard; #102295# solar mutex has to be used currently - osl::Guard< comphelper::SolarMutex > aGuard; + SolarMutexGuard aGuard; DispatchMutexLock_Impl(); public: DispatchMutexLock_Impl(SwXDispatchProviderInterceptor&); diff --git a/sw/source/core/uibase/uno/unodispatch.cxx b/sw/source/core/uibase/uno/unodispatch.cxx index 9815c9f..31503a4 100644 --- a/sw/source/core/uibase/uno/unodispatch.cxx +++ b/sw/source/core/uibase/uno/unodispatch.cxx @@ -380,8 +380,7 @@ const sal_Char* SwXDispatch::GetDBChangeURL() } SwXDispatchProviderInterceptor::DispatchMutexLock_Impl::DispatchMutexLock_Impl( - SwXDispatchProviderInterceptor& ) : - aGuard(Application::GetSolarMutex()) + SwXDispatchProviderInterceptor& ) { } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits