Tag: cws_src680_qiq User: fs Date: 06/06/16 06:35:26 Modified: /dba/dbaccess/source/core/api/ RowSet.cxx, RowSet.hxx
Log: m_xAnalyzer is superfluous File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.cxx?r1=1.143.10.4&r2=1.143.10.5 Delta lines: +4 -8 ------------------- --- RowSet.cxx 16 Jun 2006 12:45:58 -0000 1.143.10.4 +++ RowSet.cxx 16 Jun 2006 13:35:23 -0000 1.143.10.5 @@ -4,9 +4,9 @@ * * $RCSfile: RowSet.cxx,v $ * - * $Revision: 1.143.10.4 $ + * $Revision: 1.143.10.5 $ * - * last change: $Author: fs $ $Date: 2006/06/16 12:45:58 $ + * last change: $Author: fs $ $Date: 2006/06/16 13:35:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -683,7 +683,6 @@ // dispose the composer to avoid that everbody knows that the querycomposer is eol try { - m_xAnalyzer = NULL; ::comphelper::disposeComponent(m_xComposer); } catch(Exception&) @@ -1716,7 +1715,6 @@ { m_xStatement = NULL; m_xComposer = NULL; - m_xAnalyzer = NULL; Reference< XResultSet > xResultSet( impl_prepareAndExecute_throw() ); @@ -1724,7 +1722,7 @@ if ( m_aUpdateTableName.getLength() ) aComposedUpdateTableName = composeTableName( m_xActiveConnection->getMetaData(), m_aUpdateCatalogName, m_aUpdateSchemaName, m_aUpdateTableName, sal_False, ::dbtools::eInDataManipulation ); - m_pCache = new ORowSetCache(xResultSet,m_xAnalyzer,m_xServiceManager,m_aParameterRow,aComposedUpdateTableName,m_bModified,m_bNew); + m_pCache = new ORowSetCache(xResultSet,m_xComposer.get(),m_xServiceManager,m_aParameterRow,aComposedUpdateTableName,m_bModified,m_bNew); if ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY ) { m_nPrivileges = Privilege::SELECT; @@ -2252,13 +2250,11 @@ //------------------------------------------------------------------------------ ::rtl::OUString ORowSet::impl_getComposedQuery_throw( bool _bForExecution ) { - m_xComposer = NULL; - m_xAnalyzer = NULL; Reference< XMultiServiceFactory > xFactory( m_xActiveConnection, UNO_QUERY_THROW ); try { + ::comphelper::disposeComponent( m_xComposer ); m_xComposer.set( xFactory->createInstance( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY_THROW ); - m_xAnalyzer = m_xComposer.get(); } catch (const Exception& ) { File [changed]: RowSet.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.hxx?r1=1.42.60.2&r2=1.42.60.3 Delta lines: +2 -3 ------------------- --- RowSet.hxx 9 Jun 2006 11:57:45 -0000 1.42.60.2 +++ RowSet.hxx 16 Jun 2006 13:35:23 -0000 1.42.60.3 @@ -4,9 +4,9 @@ * * $RCSfile: RowSet.hxx,v $ * - * $Revision: 1.42.60.2 $ + * $Revision: 1.42.60.3 $ * - * last change: $Author: fs $ $Date: 2006/06/09 11:57:45 $ + * last change: $Author: fs $ $Date: 2006/06/16 13:35:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -124,7 +124,6 @@ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTypeMap; ::com::sun::star::uno::Any m_aTypeMap; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_xStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer > m_xAnalyzer; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xComposer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; // the columns from a table or query --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
