diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-20 21:35:53 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-20 21:35:53 +0100 |
| commit | 80cb53408655ed325aeec0fd65398dfc728da253 (patch) | |
| tree | a534e76ce590f01e8f052935d754bafdfe4e639c /sw | |
| parent | ad28ffaa37e87d8d4f57dbfd5ed2eb3aae918d68 (diff) | |
simplify
Change-Id: Ifb801f04845934ce98f346bd46a81e9bf9d0ba89
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/uibase/inc/unodispatch.hxx | 4 | ||||
| -rw-r--r-- | sw/source/core/uibase/uno/unodispatch.cxx | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/core/uibase/inc/unodispatch.hxx b/sw/source/core/uibase/inc/unodispatch.hxx index f5992c1e0465..eced0ec34c8c 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 9815c9f3b424..31503a408884 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& ) { } |