Tag: cws_src680_qiq User: fs Date: 06/05/16 21:30:26 Modified: /dba/dbaccess/source/core/api/ SingleSelectQueryComposer.cxx
Log: #i51143# changed signature of OSQLParseTreeIterator File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: SingleSelectQueryComposer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx?r1=1.13.18.3&r2=1.13.18.4 Delta lines: +9 -10 -------------------- --- SingleSelectQueryComposer.cxx 12 May 2006 14:11:53 -0000 1.13.18.3 +++ SingleSelectQueryComposer.cxx 17 May 2006 04:30:23 -0000 1.13.18.4 @@ -4,9 +4,9 @@ * * $RCSfile: SingleSelectQueryComposer.cxx,v $ * - * $Revision: 1.13.18.3 $ + * $Revision: 1.13.18.4 $ * - * last change: $Author: fs $ $Date: 2006/05/12 14:11:53 $ + * last change: $Author: fs $ $Date: 2006/05/17 04:30:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -238,8 +238,8 @@ , m_xConnection(_xConnection) , m_xMetaData(_xConnection->getMetaData()) , m_aSqlParser(_xServiceFactory) - , m_aSqlIterator( _xConnection, _rxTables, NULL, &m_aSqlParser ) - , m_aAdditiveIterator( _xConnection, _rxTables, NULL, &m_aSqlParser ) + , m_aSqlIterator( _xConnection, _rxTables, m_aSqlParser, NULL ) + , m_aAdditiveIterator( _xConnection, _rxTables, m_aSqlParser, NULL ) , m_xConnectionTables( _rxTables ) ,m_xServiceFactory(_xServiceFactory) ,m_pTables(NULL) @@ -247,15 +247,14 @@ ,m_aElementaryParts( (size_t)SQLPartCount ) { DBG_CTOR(OSingleSelectQueryComposer,NULL); - OSL_ENSURE(_xServiceFactory.is()," ServiceFactory cant be null!"); - OSL_ENSURE(_xConnection.is()," Connection cant be null!"); - OSL_ENSURE(_rxTables.is(),"TableSupplier cant be null!"); + + if ( !m_xServiceFactory.is() || !m_xConnection.is() || !m_xConnectionTables.is() ) + throw IllegalArgumentException(); registerProperty(PROPERTY_ORIGINAL,PROPERTY_ID_ORIGINAL,PropertyAttribute::BOUND|PropertyAttribute::READONLY,&m_sOrignal,::getCppuType(&m_sOrignal)); m_aCurrentColumns.resize(4); - m_aLocale = SvtSysLocale().GetLocaleData().getLocale(); m_xNumberFormatsSupplier = dbtools::getNumberFormats(m_xConnection,sal_True,m_xServiceFactory); Reference< XLocaleData> xLocaleData = Reference<XLocaleData>(m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.LocaleData"))),UNO_QUERY); @@ -573,7 +572,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); // parse and verify the statement, building a temporary iterator - OSQLParseTreeIterator aElementaryIterator( m_xConnection, m_xConnectionTables, NULL, &m_aSqlParser ); + OSQLParseTreeIterator aElementaryIterator( m_xConnection, m_xConnectionTables, m_aSqlParser, NULL ); parseAndCheck_throwError( m_aSqlParser, _rElementary, aElementaryIterator, *this ); // remember the 4 current "additive" clauses --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
