diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-05-14 13:15:38 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-05-14 14:41:54 +0200 |
| commit | 11fd73acce5d8bff7025bb6ddcbaf99d9d70b545 (patch) | |
| tree | 1a3d4dbe24e4bbbf301eca3a277e211483b3312a /sw/source/ui/inc/unodispatch.hxx | |
| parent | resolved fdo#60468 no special tab case workaround for CSV import (diff) | |
| download | core-11fd73acce5d8bff7025bb6ddcbaf99d9d70b545.tar.gz core-11fd73acce5d8bff7025bb6ddcbaf99d9d70b545.zip | |
SolarMutex does not belong into the URE interface
...so move it from osl/mutex.hxx to its own comphelper/solarmutex.hxx. It looks
like a newbie mistake that 59e7685d8d812ee8773f57475cbe3aa2a0bdfc81 "Create an
abstract interface to be used to implement a SolarMutex" put it here in the
first place.
I do not consider this an incompatible change really, as no external URE client
code should have used SolarMutex anyway.
(Also included some clean up, like removing unused
{Clearable,Resettable}SolarGuard, and spelling out SolarGuard in the few places
it is used.)
Change-Id: I121ffb5b7cefbc19e88b5405e5a85ffc895be852
Diffstat (limited to 'sw/source/ui/inc/unodispatch.hxx')
| -rw-r--r-- | sw/source/ui/inc/unodispatch.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx index 2ee0e010a44d..26eb45d759b7 100644 --- a/sw/source/ui/inc/unodispatch.hxx +++ b/sw/source/ui/inc/unodispatch.hxx @@ -27,6 +27,7 @@ #include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase3.hxx> #include <list> +#include <comphelper/solarmutex.hxx> #include <osl/mutex.hxx> class SwView; @@ -41,7 +42,7 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3 class DispatchMutexLock_Impl { //::osl::MutexGuard aGuard; #102295# solar mutex has to be used currently - osl::SolarGuard aGuard; + osl::Guard< comphelper::SolarMutex > aGuard; DispatchMutexLock_Impl(); public: DispatchMutexLock_Impl(SwXDispatchProviderInterceptor&); |