User: kz Date: 06/02/28 02:35:14 Modified: /dba/connectivity/source/drivers/evoab2/ NTables.cxx
Log: INTEGRATION: CWS evo2fixes (1.3.74); FILE MERGED 2006/02/15 12:15:37 mmeeks 1.3.74.1: Issue numbers: i#50913#, i#62042#, i#55893#, i#62043# Submitted by: misc, Tor, Jayant, me Reviewed by: mmeeks Fix a number of bugs, make it work with evo 2.4 & 2.6. File Changes: Directory: /dba/connectivity/source/drivers/evoab2/ =================================================== File [changed]: NTables.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab2/NTables.cxx?r1=1.3&r2=1.4 Delta lines: +13 -6 -------------------- --- NTables.cxx 8 Sep 2005 05:53:50 -0000 1.3 +++ NTables.cxx 28 Feb 2006 10:35:12 -0000 1.4 @@ -78,7 +78,9 @@ #ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "NDebug.hxx" #endif - +#ifndef _CONNECTIVITY_EVOAB_TABLE_HXX_ +#include "NTable.hxx" +#endif using namespace ::comphelper; using namespace ::cppu; @@ -98,7 +100,7 @@ ::rtl::OUString aSchema = ::rtl::OUString::createFromAscii("%"); Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString::createFromAscii("%"); + aTypes[0] = ::rtl::OUString::createFromAscii("TABLE"); ::rtl::OUString sEmpty; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); @@ -109,12 +111,17 @@ Reference< XRow > xRow(xResult,UNO_QUERY); if(xResult->next()) // there can be only one table with this name { - OTable* pRet = new OTable( this, sal_True, - aName, xRow->getString( 4 ), - xRow->getString( 5 ), sEmpty ); + OEvoabTable* pRet = new OEvoabTable( + this, + (OEvoabConnection *)static_cast<OEvoabCatalog&>(m_rParent).getConnection(), + aName, + xRow->getString(4), + xRow->getString(5), + sEmpty); xRet = pRet; } } + ::comphelper::disposeComponent(xResult); return xRet; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
