diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-18 18:55:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-20 09:47:16 +0100 |
| commit | 599cb40c92f2d758d21c7040790cbf2ceab213f3 (patch) | |
| tree | d29bedbe0c17dc511c6acd3bcf4b32f6231fc6d6 /framework | |
| parent | 656ed2c6f217d73e4686726783dec5b940851daf (diff) | |
osl::Mutex->std::mutex in Oxt_Handler
Change-Id: Iaa7120a5373c09a1515dc76e5a5ba19b16cf1554
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127102
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/dispatch/oxt_handler.hxx | 3 | ||||
| -rw-r--r-- | framework/source/dispatch/oxt_handler.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index 162821bc1aa8..85c6312efbf9 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> +#include <mutex> namespace framework{ @@ -78,7 +79,7 @@ class Oxt_Handler final : public ::cppu::WeakImplHelper< virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) override; private: - osl::Mutex m_mutex; + std::mutex m_mutex; css::uno::Reference< css::uno::XComponentContext > m_xContext; /// global uno service factory to create new services diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 8c806dd9a2cc..35d196ee046f 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -91,7 +91,7 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) { - osl::MutexGuard g(m_mutex); + std::unique_lock g(m_mutex); css::uno::Sequence< css::uno::Any > lParams{ css::uno::Any(aURL.Main) }; |