summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOcke Janssen <oj@openoffice.org>2000-10-25 10:24:43 +0000
committerOcke Janssen <oj@openoffice.org>2000-10-25 10:24:43 +0000
commit81d53b1459dc1a1b3e38d019f0055cc7285899a1 (patch)
tree74a96ff817adedee22516b102f6158e19451a902
parent93346bbb8f4ddf22dc5388b640fc5a6f64fb1406 (diff)
OBaseMutex has moved
-rw-r--r--connectivity/inc/connectivity/sdbcx/VColumn.hxx9
-rw-r--r--connectivity/inc/connectivity/sdbcx/VGroup.hxx13
-rw-r--r--connectivity/inc/connectivity/sdbcx/VIndex.hxx13
-rw-r--r--connectivity/inc/connectivity/sdbcx/VKey.hxx13
-rw-r--r--connectivity/inc/connectivity/sdbcx/VTable.hxx14
-rw-r--r--connectivity/inc/connectivity/sdbcx/VUser.hxx13
-rw-r--r--connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx13
-rw-r--r--connectivity/source/inc/ado/AResultSet.hxx13
-rw-r--r--connectivity/source/inc/ado/AStatement.hxx13
-rw-r--r--connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx6
-rw-r--r--connectivity/source/inc/dbase/DTables.hxx6
-rw-r--r--connectivity/source/inc/file/FDatabaseMetaData.hxx9
-rw-r--r--connectivity/source/inc/file/FResultSet.hxx6
-rw-r--r--connectivity/source/inc/file/FStatement.hxx9
-rw-r--r--connectivity/source/inc/java/sql/ResultSet.hxx6
-rw-r--r--connectivity/source/inc/odbc/OResultSet.hxx6
-rw-r--r--connectivity/source/inc/odbc/OStatement.hxx9
17 files changed, 105 insertions, 66 deletions
diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
index 217dec8e7c3d..ac90e089af71 100644
--- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: VColumn.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: oj $ $Date: 2000-10-17 08:35:02 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:21:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -80,6 +80,9 @@
#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
#include "connectivity/CommonTools.hxx"
#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
+#endif
#ifndef _CONNECTIVITY_SDBCX_DESCRIPTOR_HXX_
#include "connectivity/sdbcx/VDescriptor.hxx"
#endif
@@ -96,7 +99,7 @@ namespace connectivity
::com::sun::star::lang::XServiceInfo> OColumn_BASE;
- class OColumn : public OBaseMutex,
+ class OColumn : public comphelper::OBaseMutex,
public OColumn_BASE,
public ::comphelper::OPropertyArrayUsageHelper<OColumn>,
public ODescriptor
diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
index 03e92660e72a..de5f1e248785 100644
--- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: VGroup.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: oj $ $Date: 2000-10-17 08:35:02 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:21:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -82,8 +82,11 @@
#ifndef _CPPUHELPER_COMPBASE4_HXX_
#include <cppuhelper/compbase4.hxx>
#endif
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-#include "connectivity/CommonTools.hxx"
+//#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
+//#include "connectivity/CommonTools.hxx"
+//#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
#endif
#ifndef _CONNECTIVITY_SDBCX_COLLECTION_HXX_
#include "connectivity/sdbcx/VCollection.hxx"
@@ -112,7 +115,7 @@ namespace connectivity
::com::sun::star::container::XNamed,
::com::sun::star::lang::XServiceInfo> OGroup_BASE;
- class OGroup : public OBaseMutex,
+ class OGroup : public comphelper::OBaseMutex,
public OGroup_BASE,
public IRefreshableUsers,
public ::comphelper::OPropertyArrayUsageHelper<OGroup>,
diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
index 289f389a73d6..f95cd167e1c2 100644
--- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: VIndex.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: oj $ $Date: 2000-10-17 08:35:02 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:21:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,8 +81,11 @@
#ifndef _CPPUHELPER_COMPBASE2_HXX_
#include <cppuhelper/compbase2.hxx>
#endif
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-#include "connectivity/CommonTools.hxx"
+//#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
+//#include "connectivity/CommonTools.hxx"
+//#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
#endif
#ifndef _CONNECTIVITY_SDBCX_COLLECTION_HXX_
#include "connectivity/sdbcx/VCollection.hxx"
@@ -105,7 +108,7 @@ namespace connectivity
namespace sdbcx
{
- class OIndex : public OBaseMutex,
+ class OIndex : public comphelper::OBaseMutex,
public OColumns_BASE,
public IRefreshableColumns,
public ::comphelper::OPropertyArrayUsageHelper<OIndex>,
diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx
index 6c2d98f04c3e..588e021fa8f1 100644
--- a/connectivity/inc/connectivity/sdbcx/VKey.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: VKey.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: oj $ $Date: 2000-10-17 08:35:02 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:21:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -69,8 +69,11 @@
#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_
#include <comphelper/proparrhlp.hxx>
#endif
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-#include "connectivity/CommonTools.hxx"
+//#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
+//#include "connectivity/CommonTools.hxx"
+//#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
#endif
#ifndef _CONNECTIVITY_SDBCX_COLLECTION_HXX_
#include "connectivity/sdbcx/VCollection.hxx"
@@ -93,7 +96,7 @@ namespace connectivity
namespace sdbcx
{
- class OKey : public OBaseMutex,
+ class OKey : public comphelper::OBaseMutex,
public OColumns_BASE,
public IRefreshableColumns,
public ::comphelper::OPropertyArrayUsageHelper<OKey>,
diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/connectivity/inc/connectivity/sdbcx/VTable.hxx
index eb8725376bc0..bbe5decf35b9 100644
--- a/connectivity/inc/connectivity/sdbcx/VTable.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VTable.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: VTable.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: oj $ $Date: 2000-10-17 08:35:02 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:21:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -90,9 +90,13 @@
#ifndef _CPPUHELPER_COMPBASE8_HXX_
#include <cppuhelper/compbase8.hxx>
#endif
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-#include "connectivity/CommonTools.hxx"
+//#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
+//#include "connectivity/CommonTools.hxx"
+//#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
#endif
+
#ifndef _CONNECTIVITY_SDBCX_COLLECTION_HXX_
#include "connectivity/sdbcx/VCollection.hxx"
#endif
@@ -121,7 +125,7 @@ namespace connectivity
::com::sun::star::lang::XServiceInfo> OTable_BASE;
- class OTable : public OBaseMutex,
+ class OTable : public comphelper::OBaseMutex,
public OTable_BASE,
public IRefreshableColumns,
public ::comphelper::OPropertyArrayUsageHelper<OTable>,
diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/connectivity/inc/connectivity/sdbcx/VUser.hxx
index fcff3c22f41b..585a7672218e 100644
--- a/connectivity/inc/connectivity/sdbcx/VUser.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VUser.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: VUser.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: oj $ $Date: 2000-10-17 08:35:02 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:21:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -78,8 +78,11 @@
#ifndef _CPPUHELPER_COMPBASE4_HXX_
#include <cppuhelper/compbase4.hxx>
#endif
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-#include "connectivity/CommonTools.hxx"
+//#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
+//#include "connectivity/CommonTools.hxx"
+//#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
#endif
#ifndef _CONNECTIVITY_SDBCX_COLLECTION_HXX_
#include "connectivity/sdbcx/VCollection.hxx"
@@ -106,7 +109,7 @@ namespace connectivity
::com::sun::star::container::XNamed,
::com::sun::star::lang::XServiceInfo> OUser_BASE;
- class OUser : public OBaseMutex,
+ class OUser : public comphelper::OBaseMutex,
public OUser_BASE,
public IRefreshableGroups,
public ::comphelper::OPropertyArrayUsageHelper<OUser>,
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index bbf037865a32..4d7bc218c947 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ADatabaseMetaDataResultSet.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: fs $ $Date: 2000-10-11 10:06:46 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:24:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -98,8 +98,11 @@
#ifndef _CONNECTIVITY_ADO_ASTATEMENT_HXX_
#include "ado/AStatement.hxx"
#endif
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-#include "connectivity/CommonTools.hxx"
+//#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
+//#include "connectivity/CommonTools.hxx"
+//#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
#endif
namespace connectivity
@@ -118,7 +121,7 @@ namespace connectivity
::com::sun::star::sdbc::XCloseable,
::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE;
- class ODatabaseMetaDataResultSet : public OBaseMutex,
+ class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex,
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 22c9b39454e3..22258239e1c0 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AResultSet.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: fs $ $Date: 2000-10-11 10:06:46 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:24:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -104,8 +104,11 @@
#ifndef _CONNECTIVITY_ADO_ASTATEMENT_HXX_
#include "ado/AStatement.hxx"
#endif
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-#include "connectivity/CommonTools.hxx"
+//#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
+//#include "connectivity/CommonTools.hxx"
+//#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
#endif
#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -132,7 +135,7 @@ namespace connectivity
::com::sun::star::sdbcx::XDeleteRows,
::com::sun::star::lang::XServiceInfo> OResultSet_BASE;
- class OResultSet : public OBaseMutex,
+ class OResultSet : public comphelper::OBaseMutex,
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 36f028957229..3061dba9d37c 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AStatement.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: fs $ $Date: 2000-10-11 10:06:46 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:24:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -92,8 +92,11 @@
#ifndef _COMPHELPER_UNO3_HXX_
#include <comphelper/uno3.hxx>
#endif
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-#include "connectivity/CommonTools.hxx"
+//#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
+//#include "connectivity/CommonTools.hxx"
+//#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
#endif
#ifndef _CONNECTIVITY_ADO_ACONNECTION_HXX_
#include "ado/AConnection.hxx"
@@ -121,7 +124,7 @@ namespace connectivity
//**************************************************************
//************ Class: java.sql.Statement
//**************************************************************
- class OStatement_Base : public OBaseMutex,
+ class OStatement_Base : public comphelper::OBaseMutex,
public OStatement_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>,
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
index 5c209f375b94..0385d37abcf6 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DDatabaseMetaDataResultSet.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: fs $ $Date: 2000-10-11 10:40:52 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:24:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -128,7 +128,7 @@ namespace connectivity
DECLARE_STL_VECTOR(::com::sun::star::uno::Any,ORow);
DECLARE_STL_VECTOR(ORow, ORows);
- class ODatabaseMetaDataResultSet : public OBaseMutex,
+ class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex,
public ODatabaseMetaDataResultSet_BASE,
public ::comphelper::OPropertyContainer,
public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>
diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx
index ec191e8ba091..a2b8d195c005 100644
--- a/connectivity/source/inc/dbase/DTables.hxx
+++ b/connectivity/source/inc/dbase/DTables.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DTables.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 16:14:26 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:24:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -84,6 +84,8 @@ namespace connectivity
const ::std::vector< ::rtl::OUString> &_rVector) : ODbaseTables_BASE(_rMetaData,_rParent,_rMutex,_rVector)
{}
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+
// XAppend
virtual void SAL_CALL appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
// XDrop
diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx
index c67b040125a0..16bd80b758be 100644
--- a/connectivity/source/inc/file/FDatabaseMetaData.hxx
+++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FDatabaseMetaData.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: oj $ $Date: 2000-10-05 14:35:43 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:24:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -71,6 +71,9 @@
#ifndef _CONNECTIVITY_FILE_OCONNECTION_HXX_
#include "file/FConnection.hxx"
#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
+#endif
namespace connectivity
{
namespace file
@@ -79,7 +82,7 @@ namespace connectivity
//************ Class: java.sql.DatabaseMetaDataDate
//**************************************************************
- class ODatabaseMetaData : public OBaseMutex,
+ class ODatabaseMetaData : public comphelper::OBaseMutex,
public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData >
{
protected:
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 889882ebb6f0..3bf118d6de0a 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FResultSet.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: fs $ $Date: 2000-10-11 10:09:53 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:24:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -239,7 +239,7 @@ OFILEKeyCompare(const void * elem1, const void * elem2);
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XUnoTunnel> OResultSet_BASE;
- class OResultSet : public OBaseMutex,
+ class OResultSet : public comphelper::OBaseMutex,
public OResultSet_BASE,
public ::comphelper::OPropertyContainer,
public ::comphelper::OPropertyArrayUsageHelper<OResultSet>
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index a967a995562e..37c1c7e37b8e 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FStatement.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: fs $ $Date: 2000-10-11 10:09:53 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:24:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -110,6 +110,9 @@
#ifndef _CONNECTIVITY_FILE_FANALYZER_HXX_
#include "file/fanalyzer.hxx"
#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
+#endif
namespace connectivity
{
@@ -124,7 +127,7 @@ namespace connectivity
//**************************************************************
//************ Class: java.sql.Statement
//**************************************************************
- class OStatement_Base : public OBaseMutex,
+ class OStatement_Base : public comphelper::OBaseMutex,
public OStatement_BASE,
public ::comphelper::OPropertyContainer,
public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>
diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx
index 384e5036ed70..960924c69ed3 100644
--- a/connectivity/source/inc/java/sql/ResultSet.hxx
+++ b/connectivity/source/inc/java/sql/ResultSet.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ResultSet.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: fs $ $Date: 2000-10-11 10:42:22 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:24:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -124,7 +124,7 @@ namespace connectivity
::com::sun::star::sdbc::XColumnLocate,
::com::sun::star::lang::XServiceInfo> java_sql_ResultSet_BASE;
- class java_sql_ResultSet : public OBaseMutex,
+ class java_sql_ResultSet : public comphelper::OBaseMutex,
public java_sql_ResultSet_BASE,
public java_lang_Object,
public ::cppu::OPropertySetHelper,
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index 8a506689cfb0..1064ab0206cb 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: OResultSet.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: fs $ $Date: 2000-10-11 10:07:09 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:24:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -134,7 +134,7 @@ namespace connectivity
- class OResultSet : public OBaseMutex,
+ class OResultSet : public comphelper::OBaseMutex,
public OResultSet_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OResultSet>
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 8fbbd88355e6..760d058eb394 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: OStatement.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: fs $ $Date: 2000-10-11 10:07:09 $
+ * last change: $Author: oj $ $Date: 2000-10-25 11:24:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -107,6 +107,9 @@
#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
+#endif
namespace connectivity
{
@@ -122,7 +125,7 @@ namespace connectivity
//**************************************************************
//************ Class: java.sql.Statement
//**************************************************************
- class OStatement_Base : public OBaseMutex,
+ class OStatement_Base : public comphelper::OBaseMutex,
public OStatement_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>