INTEGRATION: CWS dba24d (1.7.152); FILE MERGED

2007/11/21 13:58:38 oj 1.7.152.2: #i68854# some clean ups
2007/11/21 12:43:39 oj 1.7.152.1: #i68854# impl TypeSettingInfo for Oracle and some clean up

1 files changed, 8 insertions, 17 deletions

diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index bf9ff8538d01..8bc8550e280a 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: KDatabaseMetaData.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 02:52:11 $
+ *  last change: $Author: rt $ $Date: 2008-01-30 07:56:02 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -815,11 +815,9 @@ Reference< XConnection > SAL_CALL KabDatabaseMetaData::getConnection(  ) throw(S
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
 {
-    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet();
+    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
     Reference< XResultSet > xRef = pResult;
 
-    pResult->setTableTypes();
-
     static ODatabaseMetaDataResultSet::ORows aRows;
     static const ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE"));
 
@@ -836,11 +834,9 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes(  ) throw(SQ
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo(  ) throw(SQLException, RuntimeException)
 {
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet();
+    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
     Reference< XResultSet > xRef = pResult;
 
-    pResult->setTypeInfoMap();
-
     static ODatabaseMetaDataResultSet::ORows aRows;
     if (aRows.empty())
     {
@@ -896,11 +892,9 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns(
     const ::rtl::OUString& tableNamePattern,
     const ::rtl::OUString& columnNamePattern) throw(SQLException, RuntimeException)
 {
-    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet();
+    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns);
     Reference< XResultSet > xRef = pResult;
 
-    pResult->setColumnsMap();
-
     ODatabaseMetaDataResultSet::ORows aRows;
 
     if (match(tableNamePattern, getAddressBookTableName(), '\0'))
@@ -968,11 +962,9 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables(
     const ::rtl::OUString&,
     const Sequence< ::rtl::OUString >& types) throw(SQLException, RuntimeException)
 {
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet();
+    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables);
     Reference< XResultSet > xRef = pResult;
 
-    pResult->setTablesMap();
-
     // check whether we have tables in the requested types
     // for the moment, we answer only the "TABLE" table type
     // when no types are given at all, we return all the tables
@@ -1032,10 +1024,9 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedures(
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns(
     const Any&, const ::rtl::OUString&, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
 {
-    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet();
-    Reference< XResultSet > xRef = pResult;
+    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns);
 
-    pResult->setVersionColumnsMap();
+    Reference< XResultSet > xRef = pResult;
 
     ODatabaseMetaDataResultSet::ORows aRows;