diff options
Diffstat (limited to 'sd/source')
-rw-r--r-- | sd/source/ui/framework/configuration/ResourceFactoryManager.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx index 6e082d9019fa..c3fc1b207ece 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -73,7 +73,7 @@ void ResourceFactoryManager::AddFactory ( if (rsURL.isEmpty()) throw lang::IllegalArgumentException(); - std::lock_guard aGuard (maMutex); + std::scoped_lock aGuard (maMutex); if (rsURL.indexOf('*') >= 0 || rsURL.indexOf('?') >= 0) { @@ -100,7 +100,7 @@ void ResourceFactoryManager::RemoveFactoryForURL ( if (rsURL.isEmpty()) throw lang::IllegalArgumentException(); - std::lock_guard aGuard (maMutex); + std::scoped_lock aGuard (maMutex); FactoryMap::iterator iFactory (maFactoryMap.find(rsURL)); if (iFactory != maFactoryMap.end()) @@ -123,7 +123,7 @@ void ResourceFactoryManager::RemoveFactoryForURL ( void ResourceFactoryManager::RemoveFactoryForReference( const Reference<XResourceFactory>& rxFactory) { - std::lock_guard aGuard (maMutex); + std::scoped_lock aGuard (maMutex); // Collect a list with all keys that map to the given factory. ::std::vector<OUString> aKeys; @@ -178,7 +178,7 @@ Reference<XResourceFactory> ResourceFactoryManager::GetFactory ( Reference<XResourceFactory> ResourceFactoryManager::FindFactory (const OUString& rsURLBase) { - std::lock_guard aGuard (maMutex); + std::scoped_lock aGuard (maMutex); FactoryMap::const_iterator iFactory (maFactoryMap.find(rsURLBase)); if (iFactory != maFactoryMap.end()) return iFactory->second; diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index d515d21cf580..4b060879ae24 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -145,7 +145,7 @@ void QueueProcessor::ProcessOneRequest ( { try { - std::lock_guard aGuard (maMutex); + std::scoped_lock aGuard (maMutex); // Create a new preview bitmap and store it in the cache. if (mpCache != nullptr && mpCacheContext) |