diff options
author | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 17:04:48 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 17:11:10 +0100 |
commit | b5423ef42e18caac3ceb5d880ba1b6a1737e155c (patch) | |
tree | e4954c19e774c597171ed41f20a3f99306cf81aa /fpicker | |
parent | 232c6f1309bb73cc6516c58da749f64ce3668932 (diff) |
WaE: misc. windows related fixes
Diffstat (limited to 'fpicker')
-rw-r--r-- | fpicker/source/win32/filepicker/SolarMutex.cxx | 1 | ||||
-rw-r--r-- | fpicker/source/win32/filepicker/asynceventnotifier.cxx | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fpicker/source/win32/filepicker/SolarMutex.cxx b/fpicker/source/win32/filepicker/SolarMutex.cxx index b11d35a16aaf..ba3d0edd6967 100644 --- a/fpicker/source/win32/filepicker/SolarMutex.cxx +++ b/fpicker/source/win32/filepicker/SolarMutex.cxx @@ -36,7 +36,6 @@ int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId) { int nAcquireCount = 0; - osl::SolarMutex& rSolarMutex = Application::GetSolarMutex(); oslThreadIdentifier nMainThreadId = Application::GetMainThreadIdentifier(); if ( nMainThreadId == nThreadId ) diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx index fac8480da907..4cfbe9431eee 100644 --- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx +++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx @@ -158,9 +158,8 @@ bool SAL_CALL CAsyncEventNotifier::startup(bool bCreateSuspended) void SAL_CALL CAsyncEventNotifier::shutdown() { - unsigned nThreadId = GetCurrentThreadId(); - - OSL_PRECOND(nThreadId != m_ThreadId, "Method called in wrong thread context!"); + OSL_PRECOND(GetCurrentThreadId() != m_ThreadId, + "Method called in wrong thread context!"); osl::ResettableMutexGuard aGuard(m_Mutex); |