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>

27 files changed, 46 insertions, 43 deletions

diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index 668d1fda7706..08053d064dc2 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONWRAPPER_HXX
 
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
-#include <comphelper/broadcasthelper.hxx>
 #include <comphelper/uno3.hxx>
 #include <connectivity/ConnectionWrapper.hxx>
 
@@ -35,7 +35,7 @@ namespace connectivity
 
     typedef ::cppu::WeakComponentImplHelper< css::sdbc::XConnection > OConnectionWeakWrapper_BASE;
 
-    class OConnectionWeakWrapper : public ::comphelper::OBaseMutex
+    class OConnectionWeakWrapper : public ::cppu::BaseMutex
                                  , public OConnectionWeakWrapper_BASE
                                  , public OConnectionWrapper
     {
diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx
index 6b6c7456e182..ff108088efa0 100644
--- a/connectivity/source/cpool/ZPooledConnection.hxx
+++ b/connectivity/source/cpool/ZPooledConnection.hxx
@@ -20,9 +20,9 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLEDCONNECTION_HXX
 
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/sdbc/XPooledConnection.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/reflection/XProxyFactory.hpp>
 
 
@@ -35,7 +35,7 @@ namespace connectivity
     typedef ::cppu::WeakComponentImplHelper<    css::sdbc::XPooledConnection
                                                ,css::lang::XEventListener>    OPooledConnection_Base;
 
-    class OPooledConnection : public ::comphelper::OBaseMutex
+    class OPooledConnection : public ::cppu::BaseMutex
                              ,public OPooledConnection_Base
     {
         css::uno::Reference< css::sdbc::XConnection >             m_xRealConnection;  // the connection fom driver
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
index efec457c6e30..6031b3e26797 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
@@ -74,7 +74,7 @@ namespace connectivity
                                                >   OResultSet_BASE;
 
 
-        class OEvoabResultSet   :public comphelper::OBaseMutex
+        class OEvoabResultSet   :public cppu::BaseMutex
                                 ,public OResultSet_BASE
                                 ,public ::comphelper::OPropertyContainer
                                 ,public ::comphelper::OPropertyArrayUsageHelper<OEvoabResultSet>
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index 4356b352c089..f54f37725d5d 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -27,10 +27,10 @@
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <comphelper/proparrhlp.hxx>
 #include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/uno3.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <comphelper/broadcasthelper.hxx>
 #include <connectivity/sqliterator.hxx>
 #include <connectivity/sqlparse.hxx>
 #include <connectivity/FValue.hxx>
@@ -137,7 +137,7 @@ namespace connectivity
         class OCommonStatement;
         typedef OSubComponent< OCommonStatement, OCommonStatement_IBase >   OStatement_CBase;
 
-        class OCommonStatement  :public comphelper::OBaseMutex
+        class OCommonStatement  :public cppu::BaseMutex
                                 ,public OCommonStatement_IBase
                                 ,public ::comphelper::OPropertyContainer
                                 ,public ::comphelper::OPropertyArrayUsageHelper< OCommonStatement >
diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index 52fb2c6cfa14..a9c67fe4ceee 100644
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <shell/kde_headers.h>
 
@@ -54,7 +54,7 @@ namespace connectivity
         typedef OMetaConnection_BASE                KabConnection_BASE; // implements basics and text encoding
         typedef std::vector< css::uno::WeakReferenceHelper > OWeakRefArray;
 
-        class KabConnection : public comphelper::OBaseMutex,
+        class KabConnection : public cppu::BaseMutex,
                             public KabConnection_BASE,
                             public OSubComponent<KabConnection, KabConnection_BASE>
         {
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index 51a3278dbf0c..9b82ff8f575d 100644
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
@@ -52,7 +52,7 @@ namespace connectivity
                                                       css::sdbc::XColumnLocate,
                                                       css::lang::XServiceInfo> KabResultSet_BASE;
 
-        class KabResultSet : public comphelper::OBaseMutex,
+        class KabResultSet : public cppu::BaseMutex,
                              public KabResultSet_BASE,
                              public ::cppu::OPropertySetHelper,
                              public comphelper::OPropertyArrayUsageHelper<KabResultSet>
diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx
index 0218d9d7fc55..1cac8d4495d1 100644
--- a/connectivity/source/drivers/kab/KStatement.hxx
+++ b/connectivity/source/drivers/kab/KStatement.hxx
@@ -43,7 +43,7 @@ namespace connectivity
         // Class KabCommonStatement
         // is a base class for the normal statement and for the prepared statement
 
-        class KabCommonStatement :  public comphelper::OBaseMutex,
+        class KabCommonStatement :  public cppu::BaseMutex,
                         public  KabCommonStatement_BASE,
                         public  ::cppu::OPropertySetHelper,
                         public  comphelper::OPropertyArrayUsageHelper<KabCommonStatement>
diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx
index 5e45859ad72d..940115baf121 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.hxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
 #include <com/sun/star/sdbcx/XDeleteRows.hpp>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 
 namespace connectivity
 {
@@ -52,7 +53,7 @@ namespace connectivity
                                                       css::lang::XServiceInfo> MacabResultSet_BASE;
         class MacabRecords;
 
-        class MacabResultSet : public   comphelper::OBaseMutex,
+        class MacabResultSet : public   cppu::BaseMutex,
                              public MacabResultSet_BASE,
                              public ::cppu::OPropertySetHelper,
                              public comphelper::OPropertyArrayUsageHelper<MacabResultSet>
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx
index 41937dd1fb7b..8ba3d2c6dce6 100644
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/util/XCancellable.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/proparrhlp.hxx>
 
 namespace connectivity
@@ -44,7 +45,7 @@ namespace connectivity
         // Class MacabCommonStatement
         // is a base class for the normal statement and for the prepared statement
 
-        class MacabCommonStatement :    public comphelper::OBaseMutex,
+        class MacabCommonStatement :    public cppu::BaseMutex,
                         public  MacabCommonStatement_BASE,
                         public  ::cppu::OPropertySetHelper,
                         public  comphelper::OPropertyArrayUsageHelper<MacabCommonStatement>
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index a80e87a8e02b..6ccc04ade875 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -67,7 +67,7 @@ namespace connectivity
         typedef ::std::allocator< TVoidPtr >    TVoidAlloc;
         typedef ::std::vector<TVoidPtr>         TVoidVector;
 
-        class OResultSet :  public  comphelper::OBaseMutex,
+        class OResultSet :  public  cppu::BaseMutex,
                             public  OResultSet_BASE,
                             public  ::cppu::OPropertySetHelper,
                             public  ::comphelper::OPropertyArrayUsageHelper<OResultSet>
diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx
index 4f5d375104b1..76f9f1f88095 100644
--- a/connectivity/source/drivers/mork/MStatement.hxx
+++ b/connectivity/source/drivers/mork/MStatement.hxx
@@ -45,7 +45,7 @@ namespace connectivity
         class OCommonStatement;
         typedef ::connectivity::OSubComponent< OCommonStatement, OCommonStatement_IBASE >  OCommonStatement_SBASE;
 
-        class OCommonStatement  :public comphelper::OBaseMutex
+        class OCommonStatement  :public cppu::BaseMutex
                                 ,public OCommonStatement_IBASE
                                 ,public ::cppu::OPropertySetHelper
                                 ,public ::comphelper::OPropertyArrayUsageHelper< OCommonStatement >
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index 56c78cc484ff..006266c78e5d 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
@@ -36,12 +36,12 @@
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <connectivity/FValue.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
-#include <comphelper/broadcasthelper.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
 namespace connectivity
@@ -60,7 +60,7 @@ namespace connectivity
     //  typedef ORefVector<ORow>            ORows;
 
     class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSet :
-                                        public comphelper::OBaseMutex,
+                                        public cppu::BaseMutex,
                                         public  ODatabaseMetaDataResultSet_BASE,
                                         public  ::comphelper::OPropertyContainer,
                                         public  ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>
diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
index d556bdf35aa2..466b123cf50c 100644
--- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx
+++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/sdbc/XDatabaseMetaData2.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include "FDatabaseMetaDataResultSet.hxx"
 #include <functional>
@@ -31,7 +31,7 @@
 namespace connectivity
 {
         class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataBase :
-                                        public  comphelper::OBaseMutex,
+                                        public  cppu::BaseMutex,
                                         public ::cppu::WeakImplHelper< css::sdbc::XDatabaseMetaData2,
                                                                        css::lang::XEventListener>
         {
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index 5dda03d317dd..0657f29d4bcc 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -30,9 +30,9 @@
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include "ado/AStatement.hxx"
-#include <comphelper/broadcasthelper.hxx>
 #include <connectivity/StdTypeDefs.hxx>
 
 namespace connectivity
@@ -50,7 +50,7 @@ namespace connectivity
                                                    css::sdbc::XCloseable,
                                                    css::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE;
 
-        class ODatabaseMetaDataResultSet :  public comphelper::OBaseMutex,
+        class ODatabaseMetaDataResultSet :  public cppu::BaseMutex,
                                     public  ODatabaseMetaDataResultSet_BASE,
                                     public  ::cppu::OPropertySetHelper,
                                     public  ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>
diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx
index ac1a532fcca4..91c74652fc87 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -34,7 +34,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include "ado/AStatement.hxx"
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 namespace connectivity
@@ -57,7 +57,7 @@ namespace connectivity
                                                   css::sdbcx::XDeleteRows,
                                                   css::lang::XServiceInfo> OResultSet_BASE;
 
-        class OResultSet :  public comphelper::OBaseMutex,
+        class OResultSet :  public cppu::BaseMutex,
                             public  OResultSet_BASE,
                             public  ::cppu::OPropertySetHelper,
                             public  ::comphelper::OPropertyArrayUsageHelper<OResultSet>
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index 1dd2fbce2311..a2fe5df6d3f8 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -28,9 +28,9 @@
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/util/XCancellable.hpp>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/broadcasthelper.hxx>
 #include "ado/AConnection.hxx"
 #include <list>
 #include "ado/Awrapado.hxx"
@@ -49,7 +49,7 @@ namespace connectivity
 
         //************ Class: java.sql.Statement
 
-        class OStatement_Base       :   public comphelper::OBaseMutex,
+        class OStatement_Base       :   public cppu::BaseMutex,
                                         public  OStatement_BASE,
                                         public  ::cppu::OPropertySetHelper,
                                         public  ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>,
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index ea2a6daf1528..f6b0c210d0c8 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include "file/FStatement.hxx"
 #include <connectivity/CommonTools.hxx>
@@ -37,7 +38,6 @@
 #include "file/fanalyzer.hxx"
 #include "file/FTable.hxx"
 #include "file/filedllapi.hxx"
-#include <comphelper/broadcasthelper.hxx>
 #include <connectivity/StdTypeDefs.hxx>
 #include "TSortIndex.hxx"
 #include "TSkipDeletedSet.hxx"
@@ -61,7 +61,7 @@ namespace connectivity
                                                   css::lang::XUnoTunnel> OResultSet_BASE;
 
         class OOO_DLLPUBLIC_FILE OResultSet :
-                            public  comphelper::OBaseMutex,
+                            public  cppu::BaseMutex,
                             public  ::connectivity::IResultSetHelper,
                             public  OResultSet_BASE,
                             public  ::comphelper::OPropertyContainer,
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 8e6c9fb9ffb1..81ebaca16f0c 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -30,6 +30,7 @@
 #include <comphelper/proparrhlp.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/uno3.hxx>
 #include <connectivity/CommonTools.hxx>
 #include "file/FConnection.hxx"
@@ -38,7 +39,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/propertycontainer.hxx>
 #include "file/fanalyzer.hxx"
-#include <comphelper/broadcasthelper.hxx>
 #include "TSortIndex.hxx"
 
 namespace connectivity
@@ -55,7 +55,7 @@ namespace connectivity
         //************ Class: java.sql.Statement
 
         class OOO_DLLPUBLIC_FILE OStatement_Base :
-                                        public  comphelper::OBaseMutex,
+                                        public  cppu::BaseMutex,
                                         public  OStatement_BASE,
                                         public  ::comphelper::OPropertyContainer,
                                         public  ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index 26d8a8e6dfc9..2cffd40677e4 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/sdb/application/XTableUIProvider.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 
@@ -51,7 +52,7 @@ namespace connectivity
                                                ,   css::sdb::application::XTableUIProvider
                                                >   OHsqlConnection_BASE;
 
-        class OHsqlConnection   :public ::comphelper::OBaseMutex
+        class OHsqlConnection   :public cppu::BaseMutex
                                 ,public OHsqlConnection_BASE
                                 ,public OConnectionWrapper
                                 ,public IMethodGuardAccess
diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
index 90a467033e16..21bc04459b93 100644
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ b/connectivity/source/inc/hsqldb/HDriver.hxx
@@ -27,8 +27,8 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/broadcasthelper.hxx>
 #include <connectivity/CommonTools.hxx>
 
 
@@ -57,7 +57,7 @@ namespace connectivity
         /** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer.
 
         */
-        class ODriverDelegator : public ::comphelper::OBaseMutex
+        class ODriverDelegator : public ::cppu::BaseMutex
                                 ,public ODriverDelegator_BASE
         {
             TWeakPairVector                                           m_aConnections; //  vector containing a list
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx
index e8292e47f2ea..fe7ff029f349 100644
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
@@ -29,11 +29,11 @@
 #include <com/sun/star/sdbc/XGeneratedResultSet.hpp>
 #include <comphelper/proparrhlp.hxx>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/uno3.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <connectivity/OSubComponent.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <comphelper/broadcasthelper.hxx>
 
 #include <java/sql/Connection.hxx>
 #include "java/sql/ConnectionLog.hxx"
@@ -50,7 +50,7 @@ namespace connectivity
 
     //************ Class: java.sql.Statement
 
-    class java_sql_Statement_Base : public comphelper::OBaseMutex,
+    class java_sql_Statement_Base : public cppu::BaseMutex,
                                     public  java_sql_Statement_BASE,
                                     public  java_lang_Object,
                                     public  ::cppu::OPropertySetHelper,
diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx
index 5a3613b374d5..975352c53f1c 100644
--- a/connectivity/source/inc/java/sql/ResultSet.hxx
+++ b/connectivity/source/inc/java/sql/ResultSet.hxx
@@ -54,7 +54,7 @@ namespace connectivity
                                                   css::lang::XServiceInfo> java_sql_ResultSet_BASE;
 
     class java_sql_Connection;
-    class java_sql_ResultSet :  public comphelper::OBaseMutex,
+    class java_sql_ResultSet :  public cppu::BaseMutex,
                                 public  java_sql_ResultSet_BASE,
                                 public  java_lang_Object,
                                 public  ::cppu::OPropertySetHelper,
diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index d0a9aeab214d..805abe8cb526 100644
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
@@ -29,8 +29,8 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/broadcasthelper.hxx>
 #include <connectivity/CommonTools.hxx>
 
 
@@ -57,7 +57,7 @@ namespace connectivity
         /** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer.
 
         */
-        class ODriverDelegator : public ::comphelper::OBaseMutex
+        class ODriverDelegator : public ::cppu::BaseMutex
                                 ,public ODriverDelegator_BASE
         {
             TJDBCDrivers                                              m_aJdbcDrivers; // all jdbc drivers
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 574714430115..8bd1d116fdcf 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -33,11 +33,11 @@
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include "odbc/OStatement.hxx"
 #include "odbc/ODatabaseMetaData.hxx"
 #include "odbc/odbcbasedllapi.hxx"
-#include <comphelper/broadcasthelper.hxx>
 #include <connectivity/StdTypeDefs.hxx>
 
 namespace connectivity
@@ -56,7 +56,7 @@ namespace connectivity
                                                    css::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE;
 
         class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaDataResultSet :
-                                    public comphelper::OBaseMutex,
+                                    public cppu::BaseMutex,
                                     public  ODatabaseMetaDataResultSet_BASE,
                                     public  ::cppu::OPropertySetHelper,
                                     public  ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index 3185738504db..3d827fe4c184 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -105,7 +105,7 @@ namespace connectivity
         typedef ::std::map< css::uno::Sequence<sal_Int8>, sal_Int32,TBookmarkPosMapCompare > TBookmarkPosMap;
 
         class OOO_DLLPUBLIC_ODBCBASE OResultSet :
-                            public  comphelper::OBaseMutex,
+                            public  cppu::BaseMutex,
                             public  ::connectivity::IResultSetHelper,
                             public  OResultSet_BASE,
                             public  ::cppu::OPropertySetHelper,
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 3138a27b3f1e..5a068eb8f991 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/util/XCancellable.hpp>
 #include <comphelper/proparrhlp.hxx>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/uno3.hxx>
 #include <connectivity/CommonTools.hxx>
 #include "odbc/OFunctions.hxx"
@@ -37,7 +38,6 @@
 #include "odbc/odbcbasedllapi.hxx"
 #include <list>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <comphelper/broadcasthelper.hxx>
 
 namespace connectivity
 {
@@ -56,7 +56,7 @@ namespace connectivity
         //************ Class: java.sql.Statement
 
         class OOO_DLLPUBLIC_ODBCBASE OStatement_Base :
-                                        public comphelper::OBaseMutex,
+                                        public cppu::BaseMutex,
                                         public  OStatement_BASE,
                                         public  ::cppu::OPropertySetHelper,
                                         public  ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>
diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx
index d2deda1aad14..416a9cfd3cbd 100644
--- a/connectivity/workben/skeleton/SResultSet.hxx
+++ b/connectivity/workben/skeleton/SResultSet.hxx
@@ -62,7 +62,7 @@ namespace connectivity
         typedef ::std::allocator< TVoidPtr >    TVoidAlloc;
         typedef ::std::vector<TVoidPtr>         TVoidVector;
 
-        class OResultSet :  public  comphelper::OBaseMutex,
+        class OResultSet :  public  cppu::BaseMutex,
                             public  OResultSet_BASE,
                             public  ::cppu::OPropertySetHelper,
                             public  ::comphelper::OPropertyArrayUsageHelper<OResultSet>