use more cppu::BaseMutex

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

5 files changed, 5 insertions, 10 deletions

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
index c75be4724654..d527f467e334 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
 #include <com/sun/star/util/XStringSubstitution.hpp>
 
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase3.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <rtl/string.hxx>
@@ -82,7 +83,7 @@ typedef OMetaConnection_BASE OConnection_BASE;
 
 typedef std::vector<css::uno::WeakReferenceHelper> OWeakRefArray;
 
-class OConnection final : public OBase_Mutex, public OConnection_BASE
+class OConnection final : public cppu::BaseMutex, public OConnection_BASE
 {
 private:
     MYSQL m_mysql;
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
index 018595b770ba..0be8e2ab347a 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
@@ -52,7 +52,7 @@ typedef ::cppu::WeakComponentImplHelper12<
     css::sdbc::XColumnLocate, css::lang::XServiceInfo>
     OPreparedResultSet_BASE;
 
-class OPreparedResultSet final : public OBase_Mutex,
+class OPreparedResultSet final : public cppu::BaseMutex,
                                  public OPreparedResultSet_BASE,
                                  public ::cppu::OPropertySetHelper,
                                  public OPropertyArrayUsageHelper<OPreparedResultSet>
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
index 461e81286cb6..8114cddc9681 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
@@ -54,7 +54,7 @@ typedef ::cppu::WeakComponentImplHelper12<
     css::sdbc::XColumnLocate, css::lang::XServiceInfo>
     OResultSet_BASE;
 
-class OResultSet final : public OBase_Mutex,
+class OResultSet final : public cppu::BaseMutex,
                          public OResultSet_BASE,
                          public ::cppu::OPropertySetHelper,
                          public OPropertyArrayUsageHelper<OResultSet>
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx
index 14750309ad87..464051b7239f 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx
@@ -49,7 +49,7 @@ typedef ::cppu::WeakComponentImplHelper3<css::sdbc::XWarningsSupplier, css::util
 //************ Class: OCommonStatement
 // is a base class for the normal statement and for the prepared statement
 
-class OCommonStatement : public OBase_Mutex,
+class OCommonStatement : public cppu::BaseMutex,
                          public OCommonStatement_IBase,
                          public ::cppu::OPropertySetHelper,
                          public OPropertyArrayUsageHelper<OCommonStatement>
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx b/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx
index d0847aedc5d6..edba70a935ab 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx
@@ -106,12 +106,6 @@ template <class TYPE>::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper<TYP
     return s_pProps;
 }
 
-class OBase_Mutex
-{
-public:
-    ::osl::Mutex m_aMutex;
-};
-
 namespace internal
 {
 template <class T> void implCopySequence(const T* _pSource, T*& _pDest, sal_Int32 _nSourceLen)