diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-02-12 16:56:44 +0100 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-02-12 16:56:44 +0100 |
| commit | db02ac8b89b8ec1e3d84f2676665667916582423 (patch) | |
| tree | 55446fdc25ea149952589d200fb6b4224a6996f8 /fpicker | |
| parent | ae19e5feff59f578d3f8de6fe9c27f9a57ba63d1 (diff) | |
changefileheader2: #i10000#: convert files with CR/LF characters to CR only
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/win32/filepicker/SolarMutex.cxx | 64 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/SolarMutex.hxx | 14 |
2 files changed, 39 insertions, 39 deletions
diff --git a/fpicker/source/win32/filepicker/SolarMutex.cxx b/fpicker/source/win32/filepicker/SolarMutex.cxx index 4ad25bce49e7..71c1bda7cea7 100644 --- a/fpicker/source/win32/filepicker/SolarMutex.cxx +++ b/fpicker/source/win32/filepicker/SolarMutex.cxx @@ -1,5 +1,5 @@ -/*************************************************************************
- *
+/************************************************************************* + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * Copyright 2000, 2010 Oracle and/or its affiliates. @@ -23,33 +23,33 @@ * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. * - ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_fpicker.hxx"
-
-#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
-#include <osl/thread.hxx>
-
-int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId)
-{
- int nAcquireCount = 0;
- vos::IMutex& rSolarMutex = Application::GetSolarMutex();
- vos::OThread::TThreadIdentifier nMainThreadId = Application::GetMainThreadIdentifier();
-
- if ( nMainThreadId == nThreadId )
- {
- ::vos::IMutex& rMutex = Application::GetSolarMutex();
- if ( rMutex.tryToAcquire() )
- nAcquireCount = Application::ReleaseSolarMutex() - 1;
- }
-
- return nAcquireCount;
-}
-
-void AcquireSolarMutex(int nAcquireCount)
-{
- if ( nAcquireCount )
- Application::AcquireSolarMutex( nAcquireCount );
-}
+ ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_fpicker.hxx" + +#include <vcl/svapp.hxx> +#include <vos/mutex.hxx> +#include <osl/thread.hxx> + +int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId) +{ + int nAcquireCount = 0; + vos::IMutex& rSolarMutex = Application::GetSolarMutex(); + vos::OThread::TThreadIdentifier nMainThreadId = Application::GetMainThreadIdentifier(); + + if ( nMainThreadId == nThreadId ) + { + ::vos::IMutex& rMutex = Application::GetSolarMutex(); + if ( rMutex.tryToAcquire() ) + nAcquireCount = Application::ReleaseSolarMutex() - 1; + } + + return nAcquireCount; +} + +void AcquireSolarMutex(int nAcquireCount) +{ + if ( nAcquireCount ) + Application::AcquireSolarMutex( nAcquireCount ); +} diff --git a/fpicker/source/win32/filepicker/SolarMutex.hxx b/fpicker/source/win32/filepicker/SolarMutex.hxx index 917b2e337f42..b5897d8ea1bb 100644 --- a/fpicker/source/win32/filepicker/SolarMutex.hxx +++ b/fpicker/source/win32/filepicker/SolarMutex.hxx @@ -1,5 +1,5 @@ -/*************************************************************************
- *
+/************************************************************************* + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * Copyright 2000, 2010 Oracle and/or its affiliates. @@ -23,8 +23,8 @@ * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. * - ************************************************************************/
-
-int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId);
-
-void AcquireSolarMutex(int nAcquireCount);
+ ************************************************************************/ + +int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId); + +void AcquireSolarMutex(int nAcquireCount); |