User: rt Date: 2008-01-30 07:56:44+0000 Modified: dba/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
Log: 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 File Changes: Directory: /dba/connectivity/source/drivers/macab/ ================================================== File [changed]: MacabDatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx?r1=1.2&r2=1.3 Delta lines: +8 -18 -------------------- --- MacabDatabaseMetaData.cxx 2007-09-13 17:51:46+0000 1.2 +++ MacabDatabaseMetaData.cxx 2008-01-30 07:56:42+0000 1.3 @@ -818,11 +818,9 @@ // ------------------------------------------------------------------------- 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::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 @@ 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 @@ 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 @@ { 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) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
