User: ihi Date: 2006/10/18 06:26:33 Modified: dba/dbaccess/source/core/api/TableDeco.cxx
Log: INTEGRATION: CWS dba205b (1.27.18); FILE MERGED 2006/09/04 11:57:50 oj 1.27.18.2: RESYNC: (1.27-1.28); FILE MERGED 2006/08/06 20:19:58 fs 1.27.18.1: #i67020# pass around a connection, needed for the column container mediator File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: TableDeco.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/TableDeco.cxx?r1=1.29&r2=1.30 Delta lines: +7 -10 -------------------- --- TableDeco.cxx 17 Sep 2006 06:33:25 -0000 1.29 +++ TableDeco.cxx 18 Oct 2006 13:26:31 -0000 1.30 @@ -122,17 +122,14 @@ //========================================================================== DBG_NAME(ODBTableDecorator) // ----------------------------------------------------------------------------- -ODBTableDecorator::ODBTableDecorator( - const Reference< XDatabaseMetaData >& _rxMetaData - ,const Reference< XColumnsSupplier >& _rxNewTable - ,const Reference< XNumberFormatsSupplier >& _rxNumberFormats - ,const Reference< XNameAccess >& _xColumnDefinitions - ) throw(SQLException) +ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnection, const Reference< XColumnsSupplier >& _rxNewTable, + const Reference< XNumberFormatsSupplier >& _rxNumberFormats, const Reference< XNameAccess >& _xColumnDefinitions ) throw(SQLException) :OTableDescriptor_BASE(m_aMutex) ,ODataSettings(OTableDescriptor_BASE::rBHelper) ,m_xTable(_rxNewTable) ,m_xColumnDefinitions(_xColumnDefinitions) - ,m_xMetaData(_rxMetaData) + ,m_xConnection( _rxConnection ) + ,m_xMetaData( _rxConnection.is() ? _rxConnection->getMetaData() : Reference< XDatabaseMetaData >() ) ,m_xNumberFormats( _rxNumberFormats ) ,m_nPrivileges(-1) ,m_pColumns(NULL) @@ -631,7 +628,7 @@ xColsSupp = xColsSupp.query( xFactory->createDataDescriptor() ); return new ODBTableDecorator( - m_xMetaData, + m_xConnection, xColsSupp, m_xNumberFormats, NULL @@ -671,9 +668,9 @@ m_xMetaData.is() && m_xMetaData->supportsAlterTableWithDropColumn()); pCol->setParent(*this); - OContainerMediator* pMediator = new OContainerMediator(pCol,m_xColumnDefinitions,sal_False); + OContainerMediator* pMediator = new OContainerMediator( pCol, m_xColumnDefinitions, m_xConnection, OContainerMediator::eColumns ); m_xColumnMediator = pMediator; - pCol->setMediator(pMediator); + pCol->setMediator( pMediator ); m_pColumns = pCol; } else --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
