Kaydet (Commit) ee47dfa4 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

LockHelper::getGlobalLock is never called with an argument

Change-Id: I90b431345d791c887f9047258a6f439bcf222784
üst 4af8a94a
...@@ -89,7 +89,10 @@ class FWI_DLLPUBLIC LockHelper : public IMutex ...@@ -89,7 +89,10 @@ class FWI_DLLPUBLIC LockHelper : public IMutex
//------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------
// something else // something else
//------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------
static LockHelper& getGlobalLock ( comphelper::SolarMutex* pSolarMutex = NULL ); static LockHelper& getGlobalLock();
//TODO: this presumable should return the SolarMutex, though it
// actually returns some independent mutex
::osl::Mutex& getShareableOslMutex( ); ::osl::Mutex& getShareableOslMutex( );
//------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------
......
...@@ -257,7 +257,7 @@ void LockHelper::downgradeWriteAccess() ...@@ -257,7 +257,7 @@ void LockHelper::downgradeWriteAccess()
@onerror No error should occure. @onerror No error should occure.
*//*-*************************************************************************************************************/ *//*-*************************************************************************************************************/
LockHelper& LockHelper::getGlobalLock( comphelper::SolarMutex* pSolarMutex ) LockHelper& LockHelper::getGlobalLock()
{ {
// Initialize static "member" only for one time! // Initialize static "member" only for one time!
// Algorithm: // Algorithm:
...@@ -274,7 +274,7 @@ LockHelper& LockHelper::getGlobalLock( comphelper::SolarMutex* pSolarMutex ) ...@@ -274,7 +274,7 @@ LockHelper& LockHelper::getGlobalLock( comphelper::SolarMutex* pSolarMutex )
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( pLock == NULL ) if( pLock == NULL )
{ {
static LockHelper aLock( pSolarMutex ); static LockHelper aLock;
pLock = &aLock; pLock = &aLock;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment