Tag: cws_src680_dba24d User: oj Date: 2007-11-21 13:58:40+0000 Modified: dba/connectivity/source/drivers/jdbc/JDriver.cxx dba/connectivity/source/drivers/kab/KDatabaseMetaData.cxx dba/connectivity/source/inc/java/sql/Connection.hxx
Log: #i68854# some clean ups File Changes: Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: JDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/JDriver.cxx?r1=1.38.54.2&r2=1.38.54.3 Delta lines: +2 -3 ------------------- --- JDriver.cxx 2007-11-21 12:40:51+0000 1.38.54.2 +++ JDriver.cxx 2007-11-21 13:58:37+0000 1.38.54.3 @@ -4,9 +4,9 @@ * * $RCSfile: JDriver.cxx,v $ * - * $Revision: 1.38.54.2 $ + * $Revision: 1.38.54.3 $ * - * last change: $Author: oj $ $Date: 2007/11/21 12:40:51 $ + * last change: $Author: oj $ $Date: 2007/11/21 13:58:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,7 +70,6 @@ #include "resource/jdbc_log.hrc" #include <comphelper/componentcontext.hxx> -#include <com/sun/star/beans/Pair.hpp> using namespace connectivity; using namespace ::com::sun::star::uno; Directory: /dba/connectivity/source/drivers/kab/ ================================================ File [changed]: KDatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KDatabaseMetaData.cxx?r1=1.7.152.1&r2=1.7.152.2 Delta lines: +6 -14 -------------------- --- KDatabaseMetaData.cxx 2007-11-21 12:43:39+0000 1.7.152.1 +++ KDatabaseMetaData.cxx 2007-11-21 13:58:38+0000 1.7.152.2 @@ -4,9 +4,9 @@ * * $RCSfile: KDatabaseMetaData.cxx,v $ * - * $Revision: 1.7.152.1 $ + * $Revision: 1.7.152.2 $ * - * last change: $Author: oj $ $Date: 2007/11/21 12:43:39 $ + * last change: $Author: oj $ $Date: 2007/11/21 13:58:38 $ * * 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< 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::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 @@ 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 @@ 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 Directory: /dba/connectivity/source/inc/java/sql/ ================================================= File [changed]: Connection.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/java/sql/Connection.hxx?r1=1.15.54.2&r2=1.15.54.3 Delta lines: +2 -4 ------------------- --- Connection.hxx 2007-11-21 12:39:25+0000 1.15.54.2 +++ Connection.hxx 2007-11-21 13:58:38+0000 1.15.54.3 @@ -4,9 +4,9 @@ * * $RCSfile: Connection.hxx,v $ * - * $Revision: 1.15.54.2 $ + * $Revision: 1.15.54.3 $ * - * last change: $Author: oj $ $Date: 2007/11/21 12:39:25 $ + * last change: $Author: oj $ $Date: 2007/11/21 13:58:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -53,8 +53,6 @@ #ifndef _CONNECTIVITY_AUTOKEYRETRIEVINGBASE_HXX_ #include "AutoRetrievingBase.hxx" #endif -#include <com/sun/star/beans/Pair.hpp> -#include <com/sun/star/beans/Optional.hpp> #include "java/sql/ConnectionLog.hxx" namespace connectivity --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
