From cd71034b26a404c8f9b763865ef6ebdd0adeebb7 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 1 Jul 2016 09:46:23 +0200
Subject: 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>
---
 connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx | 4 ++--
 connectivity/source/inc/ado/AResultSet.hxx                 | 4 ++--
 connectivity/source/inc/ado/AStatement.hxx                 | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'connectivity/source/inc/ado')

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>,
-- 
cgit