use more cppu::BaseMutex

Change-Id: Ib9da716de0addc70ca58d9085ff351c2ff8c706f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127083
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 12 insertions, 50 deletions

diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx
index aa8eecfb4fa1..7e2638eba133 100644
--- a/chart2/source/inc/ErrorBar.hxx
+++ b/chart2/source/inc/ErrorBar.hxx
@@ -18,7 +18,7 @@
  */
 #pragma once
 
-#include "MutexContainer.hxx"
+#include <cppuhelper/basemutex.hxx>
 #include "charttoolsdllapi.hxx"
 
 #include <cppuhelper/implbase.hxx>
@@ -58,7 +58,7 @@ typedef ::cppu::WeakImplHelper<
 }
 
 class ErrorBar final :
-        public MutexContainer,
+        public cppu::BaseMutex,
         public impl::ErrorBar_Base
 {
 private:
diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx
index 37b4339ea0db..37b067d1a607 100644
--- a/chart2/source/inc/LabeledDataSequence.hxx
+++ b/chart2/source/inc/LabeledDataSequence.hxx
@@ -18,7 +18,7 @@
  */
 #pragma once
 
-#include "MutexContainer.hxx"
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/chart2/data/XLabeledDataSequence2.hpp>
@@ -40,7 +40,7 @@ typedef cppu::WeakImplHelper<
 }
 
 class LabeledDataSequence :
-        public MutexContainer,
+        public cppu::BaseMutex,
         public impl::LabeledDataSequence_Base
 {
 public:
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx
index c8b061308606..468779bcbaaa 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -20,10 +20,9 @@
 
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
-#include "MutexContainer.hxx"
-
 #include <vector>
 #include <algorithm>
 #include <utility>
@@ -45,7 +44,7 @@ css::uno::Reference< css::util::XModifyListener > createModifyEventForwarder();
     this case.</p>
  */
 class ModifyEventForwarder :
-        public MutexContainer,
+        public cppu::BaseMutex,
         public ::cppu::WeakComponentImplHelper<
             css::util::XModifyBroadcaster,
             css::util::XModifyListener >
diff --git a/chart2/source/inc/MutexContainer.hxx b/chart2/source/inc/MutexContainer.hxx
deleted file mode 100644
index 4f7d189b8726..000000000000
--- a/chart2/source/inc/MutexContainer.hxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#pragma once
-
-#include <osl/mutex.hxx>
-
-namespace chart
-{
-class MutexContainer
-{
-protected:
-    MutexContainer() = default;
-
-    ~MutexContainer() = default;
-
-    mutable ::osl::Mutex m_aMutex;
-};
-
-} //  namespace chart
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/PopupRequest.hxx b/chart2/source/inc/PopupRequest.hxx
index 729cc3a941fc..ac7e783c434c 100644
--- a/chart2/source/inc/PopupRequest.hxx
+++ b/chart2/source/inc/PopupRequest.hxx
@@ -9,9 +9,9 @@
 
 #pragma once
 
-#include "MutexContainer.hxx"
 #include "charttoolsdllapi.hxx"
 
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <com/sun/star/awt/XRequestCallback.hpp>
 
@@ -22,7 +22,7 @@ namespace impl
 typedef cppu::WeakComponentImplHelper<css::awt::XRequestCallback> PopupRequest_Base;
 }
 
-class OOO_DLLPUBLIC_CHARTTOOLS PopupRequest : public MutexContainer, public impl::PopupRequest_Base
+class OOO_DLLPUBLIC_CHARTTOOLS PopupRequest : public cppu::BaseMutex, public impl::PopupRequest_Base
 {
 public:
     explicit PopupRequest();
diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx
index 77cb1903cf80..43f22d985763 100644
--- a/chart2/source/inc/RangeHighlighter.hxx
+++ b/chart2/source/inc/RangeHighlighter.hxx
@@ -18,7 +18,7 @@
  */
 #pragma once
 
-#include "MutexContainer.hxx"
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <com/sun/star/chart2/data/XRangeHighlighter.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
@@ -46,7 +46,7 @@ typedef ::cppu::WeakComponentImplHelper<
 }
 
 class RangeHighlighter :
-        public MutexContainer,
+        public cppu::BaseMutex,
         public impl::RangeHighlighter_Base
 {
 public:
diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx
index 639e29a7e50d..30ac421b3f5c 100644
--- a/chart2/source/inc/WrappedPropertySet.hxx
+++ b/chart2/source/inc/WrappedPropertySet.hxx
@@ -19,12 +19,12 @@
 #pragma once
 
 #include "WrappedProperty.hxx"
-#include "MutexContainer.hxx"
 #include "charttoolsdllapi.hxx"
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/implbase.hxx>
 
 #include <memory>
@@ -37,7 +37,7 @@ namespace chart
 {
 
 class OOO_DLLPUBLIC_CHARTTOOLS WrappedPropertySet :
-                           public MutexContainer
+                           public cppu::BaseMutex
                          , public ::cppu::WeakImplHelper
                          < css::beans::XPropertySet
                          , css::beans::XMultiPropertySet