Tag: cws_src680_dba205b User: fs Date: 2006/08/06 13:20:00 Modified: dba/dbaccess/source/core/api/TableDeco.cxx
Log: #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.27&r2=1.27.18.1 Delta lines: +10 -13 --------------------- --- TableDeco.cxx 10 Jul 2006 15:04:38 -0000 1.27 +++ TableDeco.cxx 6 Aug 2006 20:19:58 -0000 1.27.18.1 @@ -4,9 +4,9 @@ * * $RCSfile: TableDeco.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.27.18.1 $ * - * last change: $Author: obo $ $Date: 2006/07/10 15:04:38 $ + * last change: $Author: fs $ $Date: 2006/08/06 20:19:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -119,17 +119,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) @@ -628,7 +625,7 @@ xColsSupp = xColsSupp.query( xFactory->createDataDescriptor() ); return new ODBTableDecorator( - m_xMetaData, + m_xConnection, xColsSupp, m_xNumberFormats, NULL @@ -668,9 +665,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]
