From b27ede1a629ac2b5f9e98def37326d546923edec Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Mon, 23 Aug 2021 21:44:56 +0200
Subject: osl::Mutex->std::mutex in ResourceListener

Change-Id: Ide7073273be3405a1d78687a2d6dd12369dd226d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120955
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 toolkit/inc/controls/controlmodelcontainerbase.hxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'toolkit/inc/controls/controlmodelcontainerbase.hxx')

diff --git a/toolkit/inc/controls/controlmodelcontainerbase.hxx b/toolkit/inc/controls/controlmodelcontainerbase.hxx
index df5b4aac89a7..e84bb4267e42 100644
--- a/toolkit/inc/controls/controlmodelcontainerbase.hxx
+++ b/toolkit/inc/controls/controlmodelcontainerbase.hxx
@@ -37,6 +37,7 @@
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/awt/tab/XTabPageModel.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
+#include <mutex>
 #include <vector>
 
 namespace com::sun::star::resource { class XStringResourceResolver; }
@@ -181,8 +182,7 @@ protected:
 };
 
 class ResourceListener final : public css::util::XModifyListener,
-                         public ::cppu::OWeakObject,
-                         public ::cppu::BaseMutex
+                         public ::cppu::OWeakObject
 {
     public:
         ResourceListener( const css::uno::Reference< css::util::XModifyListener >& xListener );
@@ -203,6 +203,7 @@ class ResourceListener final : public css::util::XModifyListener,
         virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
     private:
+        std::mutex m_aMutex;
         css::uno::Reference< css::resource::XStringResourceResolver > m_xResource;
         css::uno::Reference< css::util::XModifyListener >             m_xListener;
         bool                                                                                    m_bListening;
-- 
cgit