summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers
diff options
context:
space:
mode:
authorOcke Janssen <oj@openoffice.org>2001-05-18 07:51:34 +0000
committerOcke Janssen <oj@openoffice.org>2001-05-18 07:51:34 +0000
commit370c89378b42d968967dfb4f9a63929de71ba881 (patch)
tree2f8a3ce0a992c6977588194acdca2083a565ccb4 /connectivity/source/drivers
parent42b04415ff98819aaf195ad80e9da8cee1c6d9d0 (diff)
#86528# size changes
Diffstat (limited to 'connectivity/source/drivers')
-rw-r--r--connectivity/source/drivers/adabas/BColumns.cxx9
-rw-r--r--connectivity/source/drivers/adabas/BGroups.cxx9
-rw-r--r--connectivity/source/drivers/adabas/BIndexes.cxx9
-rw-r--r--connectivity/source/drivers/adabas/BKeys.cxx9
-rw-r--r--connectivity/source/drivers/adabas/BTable.cxx5
-rw-r--r--connectivity/source/drivers/adabas/BTables.cxx11
-rw-r--r--connectivity/source/drivers/adabas/BUsers.cxx9
-rw-r--r--connectivity/source/drivers/adabas/BViews.cxx11
-rw-r--r--connectivity/source/drivers/ado/AColumn.cxx9
-rw-r--r--connectivity/source/drivers/ado/ADatabaseMetaData.cxx9
-rw-r--r--connectivity/source/drivers/ado/AIndex.cxx9
-rw-r--r--connectivity/source/drivers/ado/AIndexes.cxx9
-rw-r--r--connectivity/source/drivers/ado/AKeys.cxx9
-rw-r--r--connectivity/source/drivers/ado/AResultSet.cxx9
-rw-r--r--connectivity/source/drivers/ado/AStatement.cxx25
-rw-r--r--connectivity/source/drivers/ado/ATable.cxx9
-rw-r--r--connectivity/source/drivers/ado/AViews.cxx9
-rw-r--r--connectivity/source/drivers/ado/Aolevariant.cxx26
-rw-r--r--connectivity/source/drivers/ado/Awrapado.cxx94
-rw-r--r--connectivity/source/drivers/calc/CResultSet.cxx22
-rw-r--r--connectivity/source/drivers/calc/CTables.cxx5
-rw-r--r--connectivity/source/drivers/dbase/DDatabaseMetaData.cxx8
-rw-r--r--connectivity/source/drivers/dbase/DIndex.cxx11
-rw-r--r--connectivity/source/drivers/dbase/DIndexColumns.cxx9
-rw-r--r--connectivity/source/drivers/dbase/DIndexes.cxx9
-rw-r--r--connectivity/source/drivers/dbase/DResultSet.cxx23
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx5
-rw-r--r--connectivity/source/drivers/dbase/DTables.cxx6
-rw-r--r--connectivity/source/drivers/file/FResultSet.cxx14
29 files changed, 294 insertions, 107 deletions
diff --git a/connectivity/source/drivers/adabas/BColumns.cxx b/connectivity/source/drivers/adabas/BColumns.cxx
index 048d80f4971f..ec5286ef5a26 100644
--- a/connectivity/source/drivers/adabas/BColumns.cxx
+++ b/connectivity/source/drivers/adabas/BColumns.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BColumns.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -83,6 +83,11 @@
#ifndef _CONNECTIVITY_ADABAS_TABLE_HXX_
#include "adabas/BTable.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
using namespace connectivity::adabas;
diff --git a/connectivity/source/drivers/adabas/BGroups.cxx b/connectivity/source/drivers/adabas/BGroups.cxx
index a956813c6809..af8f96e3bb27 100644
--- a/connectivity/source/drivers/adabas/BGroups.cxx
+++ b/connectivity/source/drivers/adabas/BGroups.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BGroups.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,6 +77,11 @@
#ifndef _CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_
#include "sdbcx/IRefreshable.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
using namespace connectivity::adabas;
using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/drivers/adabas/BIndexes.cxx b/connectivity/source/drivers/adabas/BIndexes.cxx
index b5f153e6034d..1d91ed158df6 100644
--- a/connectivity/source/drivers/adabas/BIndexes.cxx
+++ b/connectivity/source/drivers/adabas/BIndexes.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BIndexes.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -82,6 +82,11 @@
#ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
using namespace connectivity::adabas;
using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/drivers/adabas/BKeys.cxx b/connectivity/source/drivers/adabas/BKeys.cxx
index 67e436c99a17..b3fd3873810f 100644
--- a/connectivity/source/drivers/adabas/BKeys.cxx
+++ b/connectivity/source/drivers/adabas/BKeys.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BKeys.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -80,6 +80,11 @@
#ifndef _COM_SUN_STAR_SDBC_KEYRULE_HPP_
#include <com/sun/star/sdbc/KeyRule.hpp>
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
using namespace connectivity::adabas;
using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/drivers/adabas/BTable.cxx b/connectivity/source/drivers/adabas/BTable.cxx
index 3fb3e38609d3..dd8dedccf59e 100644
--- a/connectivity/source/drivers/adabas/BTable.cxx
+++ b/connectivity/source/drivers/adabas/BTable.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BTable.cxx,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -102,6 +102,7 @@
#include <comphelper/types.hxx>
#endif
+using namespace ::comphelper;
using namespace connectivity::adabas;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
diff --git a/connectivity/source/drivers/adabas/BTables.cxx b/connectivity/source/drivers/adabas/BTables.cxx
index bb44babcb402..2839e25d7716 100644
--- a/connectivity/source/drivers/adabas/BTables.cxx
+++ b/connectivity/source/drivers/adabas/BTables.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BTables.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: oj $ $Date: 2001-05-15 08:18:12 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -98,8 +98,13 @@
#ifndef _CPPUHELPER_INTERFACECONTAINER_H_
#include <cppuhelper/interfacecontainer.h>
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
-using namespace cppu;
+using namespace ::cppu;
using namespace connectivity::adabas;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
diff --git a/connectivity/source/drivers/adabas/BUsers.cxx b/connectivity/source/drivers/adabas/BUsers.cxx
index 724f2a4cc5a8..02e25ac41756 100644
--- a/connectivity/source/drivers/adabas/BUsers.cxx
+++ b/connectivity/source/drivers/adabas/BUsers.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BUsers.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,6 +77,11 @@
#ifndef _CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_
#include "connectivity/sdbcx/IRefreshable.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
using namespace connectivity::adabas;
using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/drivers/adabas/BViews.cxx b/connectivity/source/drivers/adabas/BViews.cxx
index 98f2b4a3fdaa..e16caae5fa40 100644
--- a/connectivity/source/drivers/adabas/BViews.cxx
+++ b/connectivity/source/drivers/adabas/BViews.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: BViews.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:41:57 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -99,8 +99,13 @@
#ifndef _CONNECTIVITY_SDBCX_VIEW_HXX_
#include "connectivity/sdbcx/VView.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
-using namespace cppu;
+using namespace ::cppu;
using namespace connectivity::adabas;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 118311fa3648..3cf29278419a 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AColumn.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:41:55 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -80,6 +80,11 @@
#ifndef _COMPHELPER_EXTRACT_HXX_
#include <comphelper/extract.hxx>
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
using namespace connectivity::ado;
using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index 32efad26a173..31052e3e5ab1 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ADatabaseMetaData.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: oj $ $Date: 2001-05-17 07:26:59 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -85,6 +85,11 @@
#ifndef _CONNECTIVITY_FDATABASEMETADATARESULTSET_HXX_
#include "FDatabaseMetaDataResultSet.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
using namespace connectivity;
using namespace connectivity::ado;
diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx
index 4582db03ff4f..153f7897f614 100644
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AIndex.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:40:04 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -83,6 +83,11 @@
#ifndef CONNECTIVITY_CONNECTION_HXX
#include "TConnection.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
using namespace connectivity::ado;
using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx
index 8115897e2af4..1679d3c9d2df 100644
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AIndexes.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:40:04 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -76,6 +76,11 @@
#ifndef CONNECTIVITY_CONNECTION_HXX
#include "TConnection.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index 9536b828c8f9..b92058b874fe 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AKeys.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:40:04 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -80,8 +80,11 @@
#ifndef CONNECTIVITY_CONNECTION_HXX
#include "TConnection.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
-
+using namespace ::comphelper;
using namespace connectivity;
using namespace connectivity::ado;
using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 40665d39c37c..41a58c259d2f 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AResultSet.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: oj $ $Date: 2001-05-17 09:13:23 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -105,6 +105,11 @@
#ifndef _DBHELPER_DBEXCEPTION_HXX_
#include "connectivity/dbexception.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
#include <oledb.h>
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index ac9b93bcc540..356a1f54f73e 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AStatement.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: oj $ $Date: 2001-05-17 09:13:23 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -94,6 +94,11 @@
#ifndef _DBHELPER_DBEXCEPTION_HXX_
#include "connectivity/dbexception.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
#define CHECK_RETURN(x) \
if(!x) \
@@ -764,28 +769,28 @@ void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const A
switch(nHandle)
{
case PROPERTY_ID_QUERYTIMEOUT:
- setQueryTimeOut(connectivity::getINT32(rValue));
+ setQueryTimeOut(comphelper::getINT32(rValue));
break;
case PROPERTY_ID_MAXFIELDSIZE:
- setMaxFieldSize(connectivity::getINT32(rValue));
+ setMaxFieldSize(comphelper::getINT32(rValue));
break;
case PROPERTY_ID_MAXROWS:
- setMaxRows(connectivity::getINT32(rValue));
+ setMaxRows(comphelper::getINT32(rValue));
break;
case PROPERTY_ID_CURSORNAME:
- setCursorName(connectivity::getString(rValue));
+ setCursorName(comphelper::getString(rValue));
break;
case PROPERTY_ID_RESULTSETCONCURRENCY:
- setResultSetConcurrency(connectivity::getINT32(rValue));
+ setResultSetConcurrency(comphelper::getINT32(rValue));
break;
case PROPERTY_ID_RESULTSETTYPE:
- setResultSetType(connectivity::getINT32(rValue));
+ setResultSetType(comphelper::getINT32(rValue));
break;
case PROPERTY_ID_FETCHDIRECTION:
- setFetchDirection(connectivity::getINT32(rValue));
+ setFetchDirection(comphelper::getINT32(rValue));
break;
case PROPERTY_ID_FETCHSIZE:
- setFetchSize(connectivity::getINT32(rValue));
+ setFetchSize(comphelper::getINT32(rValue));
break;
case PROPERTY_ID_ESCAPEPROCESSING:
// return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink);
diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx
index d239a155d11b..041f2edaa38c 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ATable.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: oj $ $Date: 2001-05-17 07:26:59 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -104,6 +104,11 @@
#ifndef CONNECTIVITY_CONNECTION_HXX
#include "TConnection.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
using namespace connectivity;
using namespace connectivity::ado;
diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx
index 6fa4ba273539..ba0ba76fcb3a 100644
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AViews.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:40:04 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -91,6 +91,11 @@
#ifndef CONNECTIVITY_CONNECTION_HXX
#include "TConnection.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
using namespace connectivity;
using namespace connectivity::ado;
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index 86f935b75e98..9ab9092d4b0a 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: Aolevariant.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: oj $ $Date: 2001-05-17 09:15:34 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,6 +61,22 @@
#ifndef _CONNECTIVITY_ADO_AOLEVARIANT_HXX_
#include "ado/Aolevariant.hxx"
#endif
+#ifndef _DBHELPER_DBCONVERSION_HXX_
+#include "connectivity/dbconversion.hxx"
+#endif
+#ifndef _COM_SUN_STAR_SDBC_SQLEXCEPTION_HPP_
+#include <com/sun/star/sdbc/SQLException.hpp>
+#endif
+#ifndef _COM_SUN_STAR_UTIL_TIME_HPP_
+#include <com/sun/star/util/Time.hpp>
+#endif
+#ifndef _COM_SUN_STAR_UTIL_DATE_HPP_
+#include <com/sun/star/util/Date.hpp>
+#endif
+#ifndef _COM_SUN_STAR_UTIL_DATETIME_HPP_
+#include <com/sun/star/util/DateTime.hpp>
+#endif
+
using namespace connectivity::ado;
@@ -248,15 +264,15 @@ VARTYPE OLEVariant::getType() const { return vt; }
OLEVariant::operator ::com::sun::star::util::Date() const
{
- return connectivity::DateConversion::toDate(date,::com::sun::star::util::Date(30,12,1899));
+ return ::dbtools::DBTypeConversion::toDate(date,::com::sun::star::util::Date(30,12,1899));
}
OLEVariant::operator ::com::sun::star::util::Time() const
{
- return connectivity::DateConversion::toTime(date);
+ return ::dbtools::DBTypeConversion::toTime(date);
}
OLEVariant::operator ::com::sun::star::util::DateTime()const
{
- return connectivity::DateConversion::toDateTime(date,::com::sun::star::util::Date(30,12,1899));
+ return ::dbtools::DBTypeConversion::toDateTime(date,::com::sun::star::util::Date(30,12,1899));
}
VARIANT_BOOL OLEVariant::VariantBool(sal_Bool bEinBoolean)
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index e98093d4ebb5..6f3f9cb06517 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: Awrapado.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: oj $ $Date: 2001-05-17 07:26:59 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -261,21 +261,21 @@ void WpADOCommand::put_ActiveConnection(/* [in] */ const OLEVariant& vConn)
void WpADOCommand::Create()
{
- IClassFactory2* pIUnknown = NULL;
+ IClassFactory2* pInterface2 = NULL;
IUnknown *pOuter = NULL;
HRESULT hr;
hr = CoGetClassObject( ADOS::CLSID_ADOCOMMAND_21,
CLSCTX_INPROC_SERVER,
NULL,
IID_IClassFactory2,
- (void**)&pIUnknown );
+ (void**)&pInterface2 );
if( !FAILED( hr ) )
{
- pIUnknown->AddRef();
+ pInterface2->AddRef();
ADOCommand* pCommand=NULL;
- hr = pIUnknown->CreateInstanceLic( pOuter,
+ hr = pInterface2->CreateInstanceLic( pOuter,
NULL,
ADOS::IID_ADOCOMMAND_21,
ADOS::GetKeyStr(),
@@ -286,7 +286,7 @@ void WpADOCommand::Create()
pInterface = pCommand;
pInterface->AddRef();
}
- pIUnknown->Release();
+ pInterface2->Release();
}
}
@@ -614,21 +614,21 @@ sal_Bool WpADOCommand::Cancel()
}
void WpADORecordset::Create()
{
- IClassFactory2* pIUnknown = NULL;
+ IClassFactory2* pInterface2 = NULL;
IUnknown *pOuter = NULL;
HRESULT hr;
hr = CoGetClassObject( ADOS::CLSID_ADORECORDSET_21,
CLSCTX_INPROC_SERVER,
NULL,
IID_IClassFactory2,
- (void**)&pIUnknown );
+ (void**)&pInterface2 );
if( !FAILED( hr ) )
{
- pIUnknown->AddRef();
+ pInterface2->AddRef();
ADORecordset *pRec = NULL;
- hr = pIUnknown->CreateInstanceLic( pOuter,
+ hr = pInterface2->CreateInstanceLic( pOuter,
NULL,
ADOS::IID_ADORECORDSET_21,
ADOS::GetKeyStr(),
@@ -639,7 +639,7 @@ sal_Bool WpADOCommand::Cancel()
pInterface = pRec;
pInterface->AddRef();
}
- pIUnknown->Release();
+ pInterface2->Release();
}
}
@@ -692,14 +692,14 @@ PositionEnum WpADORecordset::get_AbsolutePosition()
return aTemp;
}
- void WpADORecordset::GetDataSource(IUnknown** pIUnknown) const
+ void WpADORecordset::GetDataSource(IUnknown** _pInterface) const
{
- pInterface->get_DataSource(pIUnknown);
+ pInterface->get_DataSource(_pInterface);
}
- void WpADORecordset::PutRefDataSource(IUnknown* pIUnknown)
+ void WpADORecordset::PutRefDataSource(IUnknown* _pInterface)
{
- pInterface->putref_DataSource(pIUnknown);
+ pInterface->putref_DataSource(_pInterface);
}
void WpADORecordset::GetBookmark(VARIANT& var)
@@ -1320,4 +1320,64 @@ sal_Bool WpADOUser::SetPermissions(
OLEVariant ObjectTypeId;
ObjectTypeId.setNoArg();
return SUCCEEDED(pInterface->SetPermissions(Name,ObjectType,Action,Rights,adInheritNone,ObjectTypeId));
-} \ No newline at end of file
+}
+
+WpBase::WpBase()
+{
+ pIUnknown = NULL;
+};
+WpBase::WpBase(IDispatch* pInt)
+ :pIUnknown(pInt)
+{
+}
+
+//inline
+WpBase& WpBase::operator=(const WpBase& rhs)
+{
+ if (rhs.pIUnknown != pIUnknown)
+ {
+ if (pIUnknown) pIUnknown->Release();
+ pIUnknown = rhs.pIUnknown;
+ if (pIUnknown) pIUnknown->AddRef();
+ }
+ return *this;
+};
+
+WpBase& WpBase::operator=(IDispatch* rhs)
+{
+ if (pIUnknown != rhs)
+ {
+ if (pIUnknown) pIUnknown->Release();
+ pIUnknown = rhs;
+ if (pIUnknown) pIUnknown->AddRef();
+ }
+ return *this;
+}
+
+WpBase::WpBase(const WpBase& aWrapper)
+{
+ operator=(aWrapper);
+}
+
+WpBase::~WpBase()
+{
+ if (pIUnknown)
+ {
+ pIUnknown->Release();
+ pIUnknown = NULL;
+ }
+}
+
+void WpBase::clear()
+{
+ if (pIUnknown)
+ {
+ pIUnknown->Release();
+ pIUnknown = NULL;
+ }
+}
+
+
+sal_Bool WpBase::IsValid() const {return pIUnknown != NULL;};
+WpBase::operator IDispatch*() { return pIUnknown; }
+
diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index c6f196abff2d..001279d940ee 100644
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: CResultSet.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: oj $ $Date: 2001-05-17 09:13:23 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -70,10 +70,14 @@
#ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+using namespace ::comphelper;
using namespace connectivity::calc;
using namespace connectivity::file;
-using namespace cppu;
+using namespace ::cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
@@ -145,7 +149,7 @@ sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const Any& bookmark ) throw(
m_bRowDeleted = m_bRowInserted = m_bRowUpdated = sal_False;
- return Move(OFileTable::FILE_BOOKMARK,connectivity::getINT32(bookmark),sal_True);
+ return Move(OFileTable::FILE_BOOKMARK,comphelper::getINT32(bookmark),sal_True);
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException)
@@ -156,7 +160,7 @@ sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const Any& bookmark,
m_bRowDeleted = m_bRowInserted = m_bRowUpdated = sal_False;
- return Move(OFileTable::FILE_BOOKMARK,connectivity::getINT32(bookmark)+rows,sal_True);
+ return Move(OFileTable::FILE_BOOKMARK,comphelper::getINT32(bookmark)+rows,sal_True);
}
// -------------------------------------------------------------------------
@@ -180,7 +184,7 @@ sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const Any& bookmark ) throw( S
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
- return connectivity::getINT32(bookmark);
+ return comphelper::getINT32(bookmark);
}
// -------------------------------------------------------------------------
// XDeleteRows
@@ -199,16 +203,16 @@ sal_Bool OCalcResultSet::fillIndexValues(const Reference< XColumnsSupplier> &_xI
return sal_False;
}
// -------------------------------------------------------------------------
-cppu::IPropertyArrayHelper & OCalcResultSet::getInfoHelper()
+::cppu::IPropertyArrayHelper & OCalcResultSet::getInfoHelper()
{
return *OCalcResultSet_BASE3::getArrayHelper();
}
// -----------------------------------------------------------------------------
-cppu::IPropertyArrayHelper* OCalcResultSet::createArrayHelper() const
+::cppu::IPropertyArrayHelper* OCalcResultSet::createArrayHelper() const
{
Sequence< Property > aProps;
describeProperties(aProps);
- return new cppu::OPropertyArrayHelper(aProps);
+ return new ::cppu::OPropertyArrayHelper(aProps);
}
// -------------------------------------------------------------------------
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index e70611ee24f4..27f5d3602b67 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: CTables.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:40:01 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -96,6 +96,7 @@
#include <comphelper/types.hxx>
#endif
+using namespace ::comphelper;
using namespace connectivity::calc;
using namespace connectivity::file;
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 786aabec0a14..47a8d31c52ce 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DDatabaseMetaData.cxx,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:37:37 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -102,7 +102,11 @@
#ifndef _COMPHELPER_EXTRACT_HXX_
#include <comphelper/extract.hxx>
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+using namespace ::comphelper;
using namespace connectivity::dbase;
using namespace connectivity;
using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 0f6828473512..c662b13c4bb3 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DIndex.cxx,v $
*
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:50:52 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -122,11 +122,16 @@
#ifndef _CONNECTIVITY_DBASE_DRESULTSET_HXX_
#include "dbase/DResultSet.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
// -------------------------------------------------------------------------
using namespace connectivity;
using namespace ucb;
using namespace utl;
-using namespace cppu;
+using namespace ::cppu;
using namespace connectivity::file;
using namespace connectivity::sdbcx;
using namespace connectivity::dbase;
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index a2b60fa84ada..aa8028ee359f 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DIndexColumns.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:37:37 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -68,6 +68,11 @@
#ifndef _CONNECTIVITY_SDBCX_INDEXCOLUMN_HXX_
#include "connectivity/sdbcx/VIndexColumn.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
using namespace connectivity::dbase;
using namespace connectivity;
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index f55751ce0570..a9b6a922374b 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DIndexes.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:37:37 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -70,6 +70,11 @@
#ifndef _UNOTOOLS_UCBHELPER_HXX
#include <unotools/ucbhelper.hxx>
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
using namespace utl;
using namespace connectivity::dbase;
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 9b7b4e3daaec..1d50a6ac2689 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DResultSet.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: oj $ $Date: 2001-05-17 09:13:21 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -79,10 +79,15 @@
#ifndef CONNECTIVITY_DBASE_DCODE_HXX
#include "dbase/DCode.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+
+using namespace ::comphelper;
using namespace connectivity::dbase;
using namespace connectivity::file;
-using namespace cppu;
+using namespace ::cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
@@ -154,7 +159,7 @@ sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const Any& bookmark ) throw(
m_bRowDeleted = m_bRowInserted = m_bRowUpdated = sal_False;
- return Move(OFileTable::FILE_BOOKMARK,connectivity::getINT32(bookmark),sal_True);
+ return Move(OFileTable::FILE_BOOKMARK,comphelper::getINT32(bookmark),sal_True);
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException)
@@ -165,7 +170,7 @@ sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const Any& bookmark,
m_bRowDeleted = m_bRowInserted = m_bRowUpdated = sal_False;
- return Move(OFileTable::FILE_BOOKMARK,connectivity::getINT32(bookmark)+rows,sal_True);
+ return Move(OFileTable::FILE_BOOKMARK,comphelper::getINT32(bookmark)+rows,sal_True);
}
// -------------------------------------------------------------------------
@@ -202,7 +207,7 @@ sal_Int32 SAL_CALL ODbaseResultSet::hashBookmark( const Any& bookmark ) throw(
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
- return connectivity::getINT32(bookmark);
+ return comphelper::getINT32(bookmark);
}
// -------------------------------------------------------------------------
// XDeleteRows
@@ -249,16 +254,16 @@ sal_Bool ODbaseResultSet::fillIndexValues(const Reference< XColumnsSupplier> &_x
return sal_False;
}
// -------------------------------------------------------------------------
-cppu::IPropertyArrayHelper & ODbaseResultSet::getInfoHelper()
+::cppu::IPropertyArrayHelper & ODbaseResultSet::getInfoHelper()
{
return *ODbaseResultSet_BASE3::getArrayHelper();
}
// -----------------------------------------------------------------------------
-cppu::IPropertyArrayHelper* ODbaseResultSet::createArrayHelper() const
+::cppu::IPropertyArrayHelper* ODbaseResultSet::createArrayHelper() const
{
Sequence< Property > aProps;
describeProperties(aProps);
- return new cppu::OPropertyArrayHelper(aProps);
+ return new ::cppu::OPropertyArrayHelper(aProps);
}
// -----------------------------------------------------------------------------
void SAL_CALL ODbaseResultSet::acquire() throw(::com::sun::star::uno::RuntimeException)
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 1a6bc6319191..bdc78d093456 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DTable.cxx,v $
*
- * $Revision: 1.45 $
+ * $Revision: 1.46 $
*
- * last change: $Author: oj $ $Date: 2001-05-17 06:46:55 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -139,6 +139,7 @@
#include <comphelper/types.hxx>
#endif
+using namespace ::comphelper;
using namespace connectivity;
using namespace connectivity::sdbcx;
using namespace connectivity::dbase;
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index b7059943c30f..c2da00ef5c5c 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DTables.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: oj $ $Date: 2001-05-14 11:37:37 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -96,7 +96,7 @@
#include <comphelper/types.hxx>
#endif
-
+using namespace ::comphelper;
using namespace connectivity::dbase;
using namespace connectivity::file;
using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 3696c92672da..74030a8a11f0 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FResultSet.cxx,v $
*
- * $Revision: 1.54 $
+ * $Revision: 1.55 $
*
- * last change: $Author: oj $ $Date: 2001-05-17 06:46:53 $
+ * last change: $Author: oj $ $Date: 2001-05-18 08:48:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -129,12 +129,14 @@
#ifndef _DBHELPER_DBEXCEPTION_HXX_
#include "connectivity/dbexception.hxx"
#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
-
-
+using namespace ::comphelper;
using namespace connectivity;
using namespace connectivity::file;
-using namespace cppu;
+using namespace ::cppu;
using namespace dbtools;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -2202,7 +2204,7 @@ BOOL OResultSet::OpenImpl()
Reference<XColumnsSupplier> xIndex;
::cppu::extractInterface(xIndex,xIndexes->getByIndex(i));
Reference<XNameAccess> xIndexCols = xIndex->getColumns();
- if(xIndexCols->hasByName(connectivity::getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)))))
+ if(xIndexCols->hasByName(comphelper::getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)))))
{
m_pFileSet = new OKeySet();