INTEGRATION: CWS dba24d (1.2.20); FILE MERGED

2008/01/11 05:56:49 oj 1.2.20.3: compile errorr
2008/01/10 06:44:40 oj 1.2.20.2: compile error
2007/11/21 12:42:03 oj 1.2.20.1: #i68854# impl TypeSettingInfo for Oracle and some clean up

1 files changed, 7 insertions, 17 deletions

diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index 9a919a8fab67..f309b7a79571 100755
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: MacabDatabaseMetaData.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: ihi $ $Date: 2007-09-13 17:51:46 $
+ *  last change: $Author: rt $ $Date: 2008-01-30 07:56:42 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -818,11 +818,9 @@ Reference< XConnection > SAL_CALL MacabDatabaseMetaData::getConnection(  ) throw
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
 {
-    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet();
+    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes);
     Reference< XResultSet > xRef = pResult;
 
-    pResult->setTableTypes();
-
     static ODatabaseMetaDataResultSet::ORows aRows;
     static const ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE"));
 
@@ -839,11 +837,9 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes(  ) throw(
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo(  ) throw(SQLException, RuntimeException)
 {
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet();
+    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTypeInfo);
     Reference< XResultSet > xRef = pResult;
 
-    pResult->setTypeInfoMap();
-
     static ODatabaseMetaDataResultSet::ORows aRows;
     if (aRows.empty())
     {
@@ -918,13 +914,11 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::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;
     MacabRecords *aRecords;
     ::rtl::OUString sTableName;
 
-    pResult->setColumnsMap();
-
     aRecords = m_xConnection->getAddressBook()->getMacabRecordsMatch(tableNamePattern);
 
     ODatabaseMetaDataResultSet::ORows aRows;
@@ -1007,11 +1001,9 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables(
     const ::rtl::OUString&,
     const Sequence< ::rtl::OUString >& types) throw(SQLException, RuntimeException)
 {
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet();
+    ODatabaseMetaDataResultSet* pResult = new 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
@@ -1084,11 +1076,9 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns(
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eVersionColumns );
 
-    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet();
+    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns);
     Reference< XResultSet > xRef = pResult;
 
-    pResult->setVersionColumnsMap();
-
     ODatabaseMetaDataResultSet::ORows aRows;
 
     if (m_xConnection->getAddressBook()->getMacabRecords(table) != NULL)