diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-13 22:10:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-14 06:59:40 +0000 |
| commit | 89fa0a42ecd71ee9e4f80d127ced396c79d5e650 (patch) | |
| tree | cb9c0d33ea8fa6b6b2fc4dbeb0d430d23e4ec987 /framework | |
| parent | 7da5639531303c7de34382c5030b67a489a6e3d5 (diff) | |
osl::Mutex->std::mutex in LoadEnvListener
Change-Id: If76feb51f0d2f187603fb1af7c27bbe3391b645b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146944
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/loadenv/loadenv.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 89feaa25d0ab..a01bc50fe582 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -105,7 +105,7 @@ class LoadEnvListener : public ::cppu::WeakImplHelper< css::frame::XLoadEventLis css::frame::XDispatchResultListener > { private: - osl::Mutex m_mutex; + std::mutex m_mutex; bool m_bWaitingResult; LoadEnv* m_pLoadEnv; @@ -468,7 +468,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::getTargetComponent() const void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::frame::XFrameLoader >&) { - osl::MutexGuard g(m_mutex); + std::unique_lock g(m_mutex); if (m_bWaitingResult) m_pLoadEnv->impl_setResult(true); m_bWaitingResult = false; @@ -476,7 +476,7 @@ void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::fram void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >&) { - osl::MutexGuard g(m_mutex); + std::unique_lock g(m_mutex); if (m_bWaitingResult) m_pLoadEnv->impl_setResult(false); m_bWaitingResult = false; @@ -484,7 +484,7 @@ void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::fra void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResultEvent& aEvent) { - osl::MutexGuard g(m_mutex); + std::unique_lock g(m_mutex); if (!m_bWaitingResult) return; @@ -508,7 +508,7 @@ void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResult void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&) { - osl::MutexGuard g(m_mutex); + std::unique_lock g(m_mutex); if (m_bWaitingResult) m_pLoadEnv->impl_setResult(false); m_bWaitingResult = false; |