comphelper::OBaseMutex -> cppu::BaseMutex

convert usage of deprecated class, and remove the old class

Change-Id: I19fb9271090d19e5531622b58492e1a848d306e2
Reviewed-on: https://gerrit.libreoffice.org/26843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

12 files changed, 23 insertions, 21 deletions

diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 058b85dfb6f1..205cc194bc42 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/sdb/XRowsChangeBroadcaster.hpp>
 
 #include <cppuhelper/compbase12.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <connectivity/paramwrapper.hxx>
 #include <connectivity/FValue.hxx>
@@ -64,7 +65,7 @@ namespace dbaccess
                                                     >   ORowSet_BASE1;
 
     class OTableContainer;
-    class ORowSet : public comphelper::OBaseMutex
+    class ORowSet : public cppu::BaseMutex
                     , public ORowSet_BASE1
                     , public ORowSetBase
                     , public ::comphelper::OPropertyArrayUsageHelper<ORowSet>
@@ -444,7 +445,7 @@ namespace dbaccess
 
     //  ORowSetClone
 
-    class ORowSetClone : public comphelper::OBaseMutex
+    class ORowSetClone : public cppu::BaseMutex
                          ,public OSubComponent
                          ,public ORowSetBase
                          ,public ::comphelper::OPropertyArrayUsageHelper < ORowSetClone >
diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx
index b0653ad1a516..67a71ccbd856 100644
--- a/dbaccess/source/core/api/resultset.hxx
+++ b/dbaccess/source/core/api/resultset.hxx
@@ -40,7 +40,7 @@
 #include <comphelper/proparrhlp.hxx>
 #include <osl/diagnose.h>
 #include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 
 namespace dbaccess
 {
@@ -58,7 +58,7 @@ namespace dbaccess
 
     //  OResultSet
 
-    class OResultSet :  public comphelper::OBaseMutex,
+    class OResultSet :  public cppu::BaseMutex,
                         public OResultSetBase,
                         public ::cppu::OPropertySetHelper,
                         public ::comphelper::OPropertyArrayUsageHelper < OResultSet >
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx
index 5367c777b948..4ebe8d053a27 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.hxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx
@@ -23,6 +23,7 @@
 #include <cppuhelper/component.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
@@ -44,7 +45,7 @@ namespace dbaccess
                                            > OSharedConnection_BASE;
     typedef ::connectivity::OConnectionWrapper  OSharedConnection_BASE2;
 
-    class OSharedConnection :   public ::comphelper::OBaseMutex
+    class OSharedConnection :   public ::cppu::BaseMutex
                               , public OSharedConnection_BASE
                               , public OSharedConnection_BASE2
     {
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 6b6508e1abf1..e06186cd91e5 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -68,7 +68,7 @@ typedef cppu::ImplHelper13  <   css::container::XChild
 
 class ODatabaseSource;
 // OConnection
-class OConnection           :public ::comphelper::OBaseMutex
+class OConnection           :public ::cppu::BaseMutex
                             ,public OSubComponent
                             ,public ::connectivity::OConnectionWrapper
                             ,public OConnection_Base
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 1ebbb6802578..6af9365ceb0a 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -159,7 +159,7 @@ namespace dbaccess
 
     // OEmbedObjectHolder
     typedef ::cppu::WeakComponentImplHelper<   embed::XStateChangeListener > TEmbedObjectHolder;
-    class OEmbedObjectHolder :   public ::comphelper::OBaseMutex
+    class OEmbedObjectHolder :   public ::cppu::BaseMutex
                                 ,public TEmbedObjectHolder
     {
         Reference< XEmbeddedObject >    m_xBroadCaster;
diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx
index 04d097637d51..ad49d889b232 100644
--- a/dbaccess/source/core/inc/ContainerMediator.hxx
+++ b/dbaccess/source/core/inc/ContainerMediator.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
@@ -35,7 +35,7 @@ namespace dbaccess
 
     class OPropertyForward;
 
-    class OContainerMediator :   public ::comphelper::OBaseMutex
+    class OContainerMediator :   public ::cppu::BaseMutex
                                 ,public ::cppu::WeakImplHelper< css::container::XContainerListener >
     {
     private:
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx
index 59f768bcae59..c83001fe05e3 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -32,8 +32,8 @@
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/interfacecontainer2.hxx>
-#include <comphelper/broadcasthelper.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/container/XChild.hpp>
@@ -80,7 +80,7 @@ namespace dbaccess
 
     typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
         PropertyChangeListenerContainer;
-    typedef ::comphelper::OBaseMutex    OContentHelper_MBASE;
+    typedef ::cppu::BaseMutex    OContentHelper_MBASE;
     typedef ::cppu::WeakComponentImplHelper<   css::ucb::XContent
                                            ,   css::ucb::XCommandProcessor
                                            ,   css::lang::XServiceInfo
diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx
index 755246cc62bf..f5756853cce0 100644
--- a/dbaccess/source/core/inc/PropertyForward.hxx
+++ b/dbaccess/source/core/inc/PropertyForward.hxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <cppuhelper/implbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
 #include <vector>
@@ -34,7 +35,7 @@ namespace dbaccess
     // OPropertyForward
     typedef ::cppu::WeakImplHelper<   css::beans::XPropertyChangeListener
                                   >   OPropertyForward_Base;
-    class OPropertyForward  :public ::comphelper::OBaseMutex
+    class OPropertyForward  :public ::cppu::BaseMutex
                             ,public OPropertyForward_Base
     {
         css::uno::Reference< css::beans::XPropertySet >       m_xSource;
diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx
index d95e185562b5..2391d7f7b114 100644
--- a/dbaccess/source/core/inc/TableDeco.hxx
+++ b/dbaccess/source/core/inc/TableDeco.hxx
@@ -55,7 +55,7 @@ namespace dbaccess
     class ODBTableDecorator;
     typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTableDecorator >  ODBTableDecorator_PROP;
 
-    class ODBTableDecorator :public comphelper::OBaseMutex
+    class ODBTableDecorator :public cppu::BaseMutex
                             ,public OTableDescriptor_BASE
                             ,public ODataSettings //ODataSettings_Base
                             ,public IColumnFactory
diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
index e62c377d9432..cad2ff8e5714 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -39,13 +39,13 @@
 #include <com/sun/star/sdbcx/XDrop.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 
-#include <comphelper/broadcasthelper.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <connectivity/FValue.hxx>
 #include <connectivity/TColumnsHelper.hxx>
 #include <connectivity/sdbcx/IRefreshable.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/propshlp.hxx>
@@ -61,7 +61,7 @@ namespace dbaccess
                                                css::container::XNamed
                                            >   OColumnBase;
 
-    class OColumn   :public comphelper::OBaseMutex
+    class OColumn   :public cppu::BaseMutex
                     ,public OColumnBase
                     ,public ::comphelper::OPropertyContainer
                     ,public IPropertyContainer  // convenience for the derived class which also derive from OColumnSettings
diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx
index 9d7f688b637c..32d6087c7662 100644
--- a/dbaccess/source/core/inc/querycomposer.hxx
+++ b/dbaccess/source/core/inc/querycomposer.hxx
@@ -27,10 +27,10 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
 #include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <connectivity/sqliterator.hxx>
 #include <connectivity/sqlparse.hxx>
 #include "apitools.hxx"
-#include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 
 
@@ -42,7 +42,7 @@ namespace dbaccess
                                     css::sdbcx::XColumnsSupplier,
                                     css::lang::XServiceInfo    > OQueryComposer_BASE;
 
-    class OQueryComposer :  public ::comphelper::OBaseMutex,
+    class OQueryComposer :  public ::cppu::BaseMutex,
                             public OSubComponent,
                             public OQueryComposer_BASE
     {
diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx
index 926f02c77872..06c7def65cda 100644
--- a/dbaccess/source/core/inc/statement.hxx
+++ b/dbaccess/source/core/inc/statement.hxx
@@ -32,15 +32,14 @@
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #include <cppuhelper/propshlp.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include "apitools.hxx"
-#include <comphelper/broadcasthelper.hxx>
-
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/implbase3.hxx>
+#include "apitools.hxx"
 
 
 //  OStatementBase
 
-class OStatementBase :  public comphelper::OBaseMutex,
+class OStatementBase :  public cppu::BaseMutex,
                         public OSubComponent,
                         public ::cppu::OPropertySetHelper,
                         public ::comphelper::OPropertyArrayUsageHelper < OStatementBase >,