From fdb8b68e80135efac827e2c7c975007cbc18f15f Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Mon, 10 Jul 2006 13:29:59 +0000 Subject: 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 --- connectivity/source/drivers/mozab/MStatement.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'connectivity/source/drivers/mozab/MStatement.cxx') diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx index 99bb2429a51c..c954ac5cf044 100644 --- a/connectivity/source/drivers/mozab/MStatement.cxx +++ b/connectivity/source/drivers/mozab/MStatement.cxx @@ -4,9 +4,9 @@ * * $RCSfile: MStatement.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: hr $ $Date: 2006-06-20 01:45:19 $ + * last change: $Author: obo $ $Date: 2006-07-10 14:29:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -126,7 +126,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) ,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 @@ void OStatement_Base::createTable( ) { 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 @@ sal_Bool OStatement_Base::parseSql( const ::rtl::OUString& sql , sal_Bool bAdjus OResultSet* OStatement_Base::createResultSet() { - return new OResultSet(this,*m_pSQLIterator); + return new OResultSet( this, m_pSQLIterator ); } // ------------------------------------------------------------------------- -- cgit