Tag: cws_src680_qiq User: fs Date: 06/05/16 21:30:59 Modified: /dba/dbaccess/source/ui/querydesign/ querycontroller.cxx
Log: #i51143# changed signature of OSQLParseTreeIterator File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: querycontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/querycontroller.cxx?r1=1.103.4.3&r2=1.103.4.4 Delta lines: +10 -11 --------------------- --- querycontroller.cxx 12 May 2006 13:45:50 -0000 1.103.4.3 +++ querycontroller.cxx 17 May 2006 04:30:56 -0000 1.103.4.4 @@ -4,9 +4,9 @@ * * $RCSfile: querycontroller.cxx,v $ * - * $Revision: 1.103.4.3 $ + * $Revision: 1.103.4.4 $ * - * last change: $Author: fs $ $Date: 2006/05/12 13:45:50 $ + * last change: $Author: fs $ $Date: 2006/05/17 04:30:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -388,15 +388,15 @@ ,m_bViewTable(sal_False) ,m_bViewFunction(sal_False) ,m_bEsacpeProcessing(sal_True) - ,m_pSqlIterator(NULL) ,m_nSplitPos(-1) ,m_nVisibleRows(0x400) ,m_bCreateView(sal_False) ,m_bIndependent( sal_False ) + ,m_pParseContext( new svxform::OSystemParseContext ) + ,m_aSqlParser( _rM, m_pParseContext ) + ,m_pSqlIterator(NULL) { DBG_CTOR(OQueryController,NULL); - m_pParseContext = new svxform::OSystemParseContext(); - m_pSqlParser = new OSQLParser(_rM,m_pParseContext); InvalidateAll(); registerProperty( PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, PropertyAttribute::READONLY | PropertyAttribute::BOUND, @@ -431,7 +431,6 @@ { deleteIterator(); - delete m_pSqlParser; delete m_pParseContext; clearFields(); @@ -582,7 +581,7 @@ } else { - ::connectivity::OSQLParseNode* pNode = m_pSqlParser->parseTree(aErrorMsg,m_sStatement,m_bDesign); + ::connectivity::OSQLParseNode* pNode = m_aSqlParser.parseTree(aErrorMsg,m_sStatement,m_bDesign); // m_pParseNode = pNode; if(pNode) { @@ -705,7 +704,7 @@ { ::rtl::OUString aErrorMsg; setStatement_fireEvent( getContainer()->getStatement() ); - ::connectivity::OSQLParseNode* pNode = m_pSqlParser->parseTree( aErrorMsg, m_sStatement, m_bDesign ); + ::connectivity::OSQLParseNode* pNode = m_aSqlParser.parseTree( aErrorMsg, m_sStatement, m_bDesign ); if ( pNode ) { Window* pView = getView(); @@ -923,7 +922,7 @@ OSL_ENSURE(m_xComposer.is(),"No querycomposer available!"); Reference<XTablesSupplier> xTablesSup(getConnection(), UNO_QUERY); deleteIterator(); - m_pSqlIterator = new ::connectivity::OSQLParseTreeIterator( getConnection(), xTablesSup->getTables(), NULL, m_pSqlParser ); + m_pSqlIterator = new ::connectivity::OSQLParseTreeIterator( getConnection(), xTablesSup->getTables(), m_aSqlParser, NULL ); } } } @@ -1473,7 +1472,7 @@ { ::rtl::OUString aErrorMsg; - ::connectivity::OSQLParseNode* pNode = m_pSqlParser->parseTree( aErrorMsg, m_sStatement, m_bDesign ); + ::connectivity::OSQLParseNode* pNode = m_aSqlParser.parseTree( aErrorMsg, m_sStatement, m_bDesign ); if(pNode) { pNode->parseNodeToStr( sTranslatedStmt, @@ -1606,7 +1605,7 @@ if ( m_bEsacpeProcessing ) { ::rtl::OUString aErrorMsg; - ::connectivity::OSQLParseNode* pNode = m_pSqlParser->parseTree(aErrorMsg,m_sStatement,m_bDesign); + ::connectivity::OSQLParseNode* pNode = m_aSqlParser.parseTree(aErrorMsg,m_sStatement,m_bDesign); // m_pParseNode = pNode; if(pNode) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
