vcl/source/graphic/UnoGraphicObject.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
New commits: commit ceccfbb7e81edea31d7cc792b1a31473f9d9feee Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Wed Jul 21 16:11:03 2021 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Jul 22 08:57:36 2021 +0200 osl::Mutex->std::mutex in GraphicObjectImpl Change-Id: I4c62d4b105425d4fb39eefdb7117299488af47dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119336 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/vcl/source/graphic/UnoGraphicObject.cxx b/vcl/source/graphic/UnoGraphicObject.cxx index bab6bffe5beb..6a627bece94d 100644 --- a/vcl/source/graphic/UnoGraphicObject.cxx +++ b/vcl/source/graphic/UnoGraphicObject.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <vcl/GraphicObject.hxx> +#include <mutex> using namespace css; @@ -36,7 +37,7 @@ typedef ::cppu::WeakImplHelper<graphic::XGraphicObject, css::lang::XServiceInfo> // goodies/toolkit/extensions ) class GraphicObjectImpl : public GraphicObject_BASE { - osl::Mutex m_aMutex; + std::mutex m_aMutex; std::unique_ptr<GraphicObject> mpGraphicObject; public: @@ -70,7 +71,7 @@ GraphicObjectImpl::GraphicObjectImpl(const uno::Sequence<uno::Any>& /*rArgs*/) uno::Reference<graphic::XGraphic> SAL_CALL GraphicObjectImpl::getGraphic() { - osl::MutexGuard aGuard(m_aMutex); + std::lock_guard aGuard(m_aMutex); if (!mpGraphicObject) throw uno::RuntimeException(); @@ -79,7 +80,7 @@ uno::Reference<graphic::XGraphic> SAL_CALL GraphicObjectImpl::getGraphic() void SAL_CALL GraphicObjectImpl::setGraphic(uno::Reference<graphic::XGraphic> const & rxGraphic) { - osl::MutexGuard aGuard(m_aMutex); + std::lock_guard aGuard(m_aMutex); if (!mpGraphicObject) throw uno::RuntimeException(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits