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 /fpicker/source | |
| parent | a883783c2a1b0e7a8ee5b46387d1e1e3bc5e19bd (diff) | |
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 'fpicker/source')
| -rw-r--r-- | fpicker/source/win32/filepicker/SolarMutex.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpicker/source/win32/filepicker/SolarMutex.cxx b/fpicker/source/win32/filepicker/SolarMutex.cxx index ed4c28998cc6..c21f994e177f 100644 --- a/fpicker/source/win32/filepicker/SolarMutex.cxx +++ b/fpicker/source/win32/filepicker/SolarMutex.cxx @@ -19,7 +19,7 @@ #include <vcl/svapp.hxx> -#include <osl/mutex.hxx> +#include <comphelper/solarmutex.hxx> #include <osl/thread.hxx> int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId) @@ -29,7 +29,7 @@ int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId) if ( nMainThreadId == nThreadId ) { - ::osl::SolarMutex& rMutex = Application::GetSolarMutex(); + comphelper::SolarMutex& rMutex = Application::GetSolarMutex(); if ( rMutex.tryToAcquire() ) nAcquireCount = Application::ReleaseSolarMutex() - 1; } |