Tag: cws_src680_dba205b User: fs Date: 2006/08/06 13:21:21 Modified: dba/dbaccess/source/core/api/query.cxx
Log: #i67020# hold the column container mediator as ::rtl::Reference File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: query.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/query.cxx?r1=1.31&r2=1.31.20.1 Delta lines: +8 -13 -------------------- --- query.cxx 10 Jul 2006 15:05:45 -0000 1.31 +++ query.cxx 6 Aug 2006 20:21:18 -0000 1.31.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: query.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.31.20.1 $ * - * last change: $Author: obo $ $Date: 2006/07/10 15:05:45 $ + * last change: $Author: fs $ $Date: 2006/08/06 20:21:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -143,7 +143,7 @@ ,ODataSettings(m_aBHelper,sal_True) ,m_xCommandDefinition(_rxCommandDefinition) ,m_xConnection(_rxConn) - ,m_pMediator(NULL) + ,m_pColumnMediator( NULL ) ,m_pWarnings( NULL ) ,m_bCaseSensitiv(sal_True) ,m_eDoingCurrently(NONE) @@ -190,18 +190,14 @@ try { - m_pMediator = NULL; - m_xColumnMediator = NULL; + m_pColumnMediator = NULL; Reference<XColumnsSupplier> xColSup(m_xCommandDefinition,UNO_QUERY); if ( xColSup.is() ) { Reference< XNameAccess > xColumnDefinitions = xColSup->getColumns(); if ( xColumnDefinitions.is() ) - { - m_pMediator = new OContainerMediator(m_pColumns,xColumnDefinitions,sal_False); - m_xColumnMediator = m_pMediator; - } + m_pColumnMediator = new OContainerMediator( m_pColumns, xColumnDefinitions, m_xConnection, OContainerMediator::eColumns ); } // fill the columns with columns from the statement @@ -254,8 +250,8 @@ implAppendColumn( *pBegin, pColumn ); Reference<XPropertySet> xDest(*pColumn,UNO_QUERY); - if ( m_pMediator ) - m_pMediator->notifyElementCreated(*pBegin,xDest); + if ( m_pColumnMediator.is() ) + m_pColumnMediator->notifyElementCreated( *pBegin, xDest ); } } catch( const SQLContext& e ) @@ -342,7 +338,6 @@ void SAL_CALL OQuery::disposing() { MutexGuard aGuard(m_aMutex); - m_xColumnMediator = NULL; if (m_xCommandDefinition.is()) { m_xCommandDefinition->removePropertyChangeListener(::rtl::OUString(), this); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
