mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LockHelper::getGlobalLock is never called with an argument

Browse Source 
Change-Id: I90b431345d791c887f9047258a6f439bcf222784
This commit is contained in:
Stephan Bergmann
2013-05-14 14:24:35 +02:00
parent 4af8a94a96
commit ee47dfa474
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
framework/inc/threadhelp/lockhelper.hxx
View File

@@ -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( );
//------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------

4
framework/source/fwi/threadhelp/lockhelper.cxx
View File

@@ -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 )
::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;
} }
} }