User: ihi Date: 2006/10/18 06:27:01 Modified: dba/dbaccess/source/core/api/query.cxx
Log: INTEGRATION: CWS dba205b (1.31.20); FILE MERGED 2006/08/06 20:21:18 fs 1.31.20.1: #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.32&r2=1.33 Delta lines: +5 -10 -------------------- --- query.cxx 17 Sep 2006 06:35:02 -0000 1.32 +++ query.cxx 18 Oct 2006 13:26:59 -0000 1.33 @@ -146,7 +146,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) @@ -193,18 +193,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 @@ -257,8 +253,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 ) @@ -345,7 +341,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]
