User: ihi Date: 2006/10/18 06:27:55 Modified: dba/dbaccess/source/core/api/tablecontainer.cxx
Log: INTEGRATION: CWS dba205b (1.62.20); FILE MERGED 2006/08/09 19:52:45 fs 1.62.20.2: notifyDataSourceModified is not needed 2006/08/06 20:20:47 fs 1.62.20.1: #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.63&r2=1.64 Delta lines: +8 -15 -------------------- --- tablecontainer.cxx 17 Sep 2006 06:36:55 -0000 1.63 +++ tablecontainer.cxx 18 Oct 2006 13:27:52 -0000 1.64 @@ -192,13 +192,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 ); } //------------------------------------------------------------------------------ @@ -298,7 +298,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(); } @@ -344,8 +344,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; @@ -362,7 +362,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(); } @@ -574,8 +574,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) @@ -604,12 +603,6 @@ if(xCont.is()) xCont->addContainerListener(this); } -// ----------------------------------------------------------------------------- -void OTableContainer::notifyDataSourceModified() -{ - // nothing to do here -} - // ----------------------------------------------------------------------------- // two ways to obtain all tables from XDatabaseMetaData::getTables, via passing a particular // table type filter: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
