diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-24 15:03:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-27 14:11:02 +0000 |
| commit | 0292570e63d51f222d9776e0c8714af4cb365b52 (patch) | |
| tree | 823c6e98133b1a2b67096023267f874dc0d4c95c /forms | |
| parent | 1ce02008ae8b61a6a489e65bd32b5e8bdc47e99e (diff) | |
osl::Mutex->std::mutex in CProgressHandlerHelper
Change-Id: I86ddf381e0d52fe50739d5378ea36059a4d1e521
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147863
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/xforms/submission/submission.hxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index 42469336ccdc..65631b9a21c1 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -21,7 +21,6 @@ #include <tools/urlobj.hxx> #include <osl/conditn.hxx> -#include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Any.hxx> @@ -39,6 +38,7 @@ #include "serialization.hxx" #include <memory> +#include <mutex> #include <utility> class CSubmissionPut; @@ -72,7 +72,7 @@ class CProgressHandlerHelper final : public cppu::WeakImplHelper< css::ucb::XPro friend class CSubmissionPost; friend class CSubmissionGet; osl::Condition m_cFinished; - osl::Mutex m_mLock; + std::mutex m_mLock; sal_Int32 m_count; public: CProgressHandlerHelper() @@ -80,20 +80,18 @@ public: {} virtual void SAL_CALL push( const css::uno::Any& /*aStatus*/) override { - m_mLock.acquire(); + std::unique_lock g(m_mLock); m_count++; - m_mLock.release(); } virtual void SAL_CALL update(const css::uno::Any& /*aStatus*/) override { } virtual void SAL_CALL pop() override { - m_mLock.acquire(); + std::unique_lock g(m_mLock); m_count--; if (m_count == 0) m_cFinished.set(); - m_mLock.release(); } }; |