diff options
| author | Noel Grandin <noel@peralex.com> | 2016-07-01 09:46:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-04 06:49:07 +0000 |
| commit | cd71034b26a404c8f9b763865ef6ebdd0adeebb7 (patch) | |
| tree | ff2aaa6a6d1849b51d883d48dfdef04b17817fcd /connectivity/source/inc/java | |
| parent | 70bfe5f71c1d45c14ce831051480a11c58ffc34d (diff) | |
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>
Diffstat (limited to 'connectivity/source/inc/java')
| -rw-r--r-- | connectivity/source/inc/java/sql/JStatement.hxx | 4 | ||||
| -rw-r--r-- | connectivity/source/inc/java/sql/ResultSet.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
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, |