Tag: cws_src680_dba205b User: fs Date: 2006/08/06 13:20:50 Modified: dba/dbaccess/source/core/api/tablecontainer.cxx
Log: #i67020# pass around a connection, needed for the column container mediator File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: tablecontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/tablecontainer.cxx?r1=1.62&r2=1.62.20.1 Delta lines: +11 -12 --------------------- --- tablecontainer.cxx 10 Jul 2006 15:07:25 -0000 1.62 +++ tablecontainer.cxx 6 Aug 2006 20:20:47 -0000 1.62.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: tablecontainer.cxx,v $ * - * $Revision: 1.62 $ + * $Revision: 1.62.20.1 $ * - * last change: $Author: obo $ $Date: 2006/07/10 15:07:25 $ + * last change: $Author: fs $ $Date: 2006/08/06 20:20:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -189,13 +189,13 @@ IWarningsContainer* _pWarningsContainer) :OFilteredContainer(_rParent,_rMutex,_xCon,_bCase,_pRefreshListener,_pWarningsContainer) ,m_xTableDefinitions(_xTableDefinitions) - ,m_pMediator(NULL) + ,m_pTableMediator( NULL ) ,m_bInAppend(sal_False) ,m_bInDrop(sal_False) { DBG_CTOR(OTableContainer, NULL); - m_pMediator = new OContainerMediator(this,Reference<XNameAccess>(_xTableDefinitions,UNO_QUERY)); - m_xTableMediator = m_pMediator; + m_pTableMediator = new OContainerMediator( + this, Reference< XNameAccess >( _xTableDefinitions, UNO_QUERY ), m_xConnection, OContainerMediator::eTables ); } //------------------------------------------------------------------------------ @@ -295,7 +295,7 @@ if ( xSup.is() ) { - ODBTableDecorator* pTable = new ODBTableDecorator( m_xMetaData, xSup, ::dbtools::getNumberFormats( m_xConnection ) ,xColumnDefinitions); + ODBTableDecorator* pTable = new ODBTableDecorator( m_xConnection, xSup, ::dbtools::getNumberFormats( m_xConnection ) ,xColumnDefinitions); xRet = pTable; pTable->construct(); } @@ -341,8 +341,8 @@ if ( xTableDefinition.is() ) ::comphelper::copyProperties(xTableDefinition,xDest); - if ( m_pMediator ) - m_pMediator->notifyElementCreated(_rName,xDest); + if ( m_pTableMediator.is() ) + m_pTableMediator->notifyElementCreated(_rName,xDest); } return xRet; @@ -359,7 +359,7 @@ if ( xDataFactory.is() && m_xMetaData.is() ) { xMasterColumnsSup = Reference< XColumnsSupplier >( xDataFactory->createDataDescriptor(), UNO_QUERY ); - ODBTableDecorator* pTable = new ODBTableDecorator( m_xMetaData, xMasterColumnsSup, ::dbtools::getNumberFormats( m_xConnection ) ,NULL); + ODBTableDecorator* pTable = new ODBTableDecorator( m_xConnection, xMasterColumnsSup, ::dbtools::getNumberFormats( m_xConnection ) ,NULL); xRet = pTable; pTable->construct(); } @@ -571,8 +571,7 @@ OFilteredContainer::disposing(); // say our listeners goobye m_xTableDefinitions = NULL; - m_pMediator = NULL; - m_xTableMediator = NULL; + m_pTableMediator = NULL; } // ----------------------------------------------------------------------------- void SAL_CALL OTableContainer::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
