diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-20 15:49:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-20 17:30:02 +0100 |
| commit | 4ddb43bcf159f8cff4bb090da218c4f150dceab8 (patch) | |
| tree | f002cc8e24553caed1a0ed4eb6849c71aa3baaa5 /framework/source/services/desktop.cxx | |
| parent | aa4e31ab274cdcc53d715d923823adcdadb6be22 (diff) | |
Turn odd framework::LockHelper::getGlobalLock() into an osl::Mutex
...and extract it to framework::GlobalLock::get().
The old lock was actually effectively two different locks,
LockHelper::getGloblaLock() and
LockHelper::getGlobalLock().getShareableOslMutex(), and both were used in
different places. These places all use the same single osl::Mutex instance now,
but hopefully that does not lead to problems (which it shouldn't, given the
documentation of LockHelper::getShareableOslMutex: "Sometimes we need a osl-
mutex for sharing with our uno helper ... What can we do? We must use a
different mutex member :-( I HOPE IT WORKS!").
Of course, the "TODO: This presumable should return the SolarMutex" still
applies.
Change-Id: I7caea3241d1b70a00272fe1f2214c071ef22cf2c
Diffstat (limited to 'framework/source/services/desktop.cxx')
| -rw-r--r-- | framework/source/services/desktop.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 028397db5989..44c24ab20fcb 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -1533,7 +1533,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue , if( pInfoHelper == NULL ) { // Ready for multithreading - ::osl::MutexGuard aGuard( LockHelper::getGlobalLock().getShareableOslMutex() ); + ::osl::MutexGuard aGuard( GlobalLock::get() ); // Control this pointer again, another instance can be faster then these! if( pInfoHelper == NULL ) { @@ -1581,7 +1581,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropert if( pInfo == NULL ) { // Ready for multithreading - ::osl::MutexGuard aGuard( LockHelper::getGlobalLock().getShareableOslMutex() ); + ::osl::MutexGuard aGuard( GlobalLock::get() ); // Control this pointer again, another instance can be faster then these! if( pInfo == NULL ) { |