summaryrefslogtreecommitdiff
path: root/connectivity/inc/connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/inc/connectivity')
-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
6 files changed, 47 insertions, 28 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>,