User: obo Date: 2006/07/10 07:30:01 Modified: dba/connectivity/source/drivers/mozab/MStatement.cxx
Log: INTEGRATION: CWS qiq (1.11.30); FILE MERGED 2006/06/27 14:41:29 fs 1.11.30.4: RESYNC: (1.11-1.12); FILE MERGED 2006/05/17 11:55:27 fs 1.11.30.3: #i51143# signature of OSQLParseTreeIterator ctor changed 2006/05/17 04:36:54 fs 1.11.30.2: #i51143# changed signature of OSQLParseTreeIterator 2006/05/10 10:52:23 fs 1.11.30.1: #i51443# changed API of the OSQLParseIterator File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MStatement.cxx?r1=1.12&r2=1.13 Delta lines: +8 -7 ------------------- --- MStatement.cxx 20 Jun 2006 01:45:19 -0000 1.12 +++ MStatement.cxx 10 Jul 2006 14:29:59 -0000 1.13 @@ -126,7 +126,7 @@ ,m_pTable(NULL) ,m_pConnection(_pConnection) ,m_aParser(_pConnection->getDriver()->getMSFactory()) - ,m_pSQLIterator( new connectivity::OSQLParseTreeIterator( _pConnection->createCatalog()->getTables(), _pConnection->getMetaData(), NULL ) ) + ,m_pSQLIterator( new OSQLParseTreeIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser, NULL ) ) ,m_pParseTree(NULL) ,rBHelper(OStatement_BASE::rBHelper) { @@ -260,7 +260,8 @@ { getOwnConnection()->throwGenericSQLException( _aDbHelper.getErrorResourceId() ); } - m_pSQLIterator.reset( new connectivity::OSQLParseTreeIterator(m_pConnection->createCatalog()->getTables(), m_pConnection->getMetaData(), NULL) ); + m_pSQLIterator.reset( new ::connectivity::OSQLParseTreeIterator( + m_pConnection, m_pConnection->createCatalog()->getTables(), m_aParser, NULL ) ); } } @@ -341,7 +342,7 @@ OResultSet* OStatement_Base::createResultSet() { - return new OResultSet(this,*m_pSQLIterator); + return new OResultSet( this, m_pSQLIterator ); } // ------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
