User: ihi Date: 2006/10/18 06:27:41 Modified: dba/dbaccess/source/core/api/table.cxx
Log: INTEGRATION: CWS dba205b (1.56.18); FILE MERGED 2006/09/04 11:56:31 oj 1.56.18.3: RESYNC: (1.56-1.57); FILE MERGED 2006/08/09 19:51:19 fs 1.56.18.2: refreshColumns is overwritten unnecessarily 2006/08/06 20:20:05 fs 1.56.18.1: #i67020# hold the column container mediator as ::rtl::Reference File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: table.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/table.cxx?r1=1.58&r2=1.59 Delta lines: +3 -9 ------------------- --- table.cxx 17 Sep 2006 06:36:41 -0000 1.58 +++ table.cxx 18 Oct 2006 13:27:38 -0000 1.59 @@ -231,7 +231,7 @@ OTable_Base::disposing(); m_xColumnDefinitions = NULL; m_xDriverColumns = NULL; - m_xColumnMediator = NULL; + m_pColumnMediator = NULL; } //------------------------------------------------------------------------------ @@ -432,11 +432,6 @@ throw SQLException(DBACORE_RESSTRING(RID_STR_COLUMN_ALTER_BY_NAME),*this,SQLSTATE_GENERAL,1000,Any() ); m_pColumns->refresh(); } -// ------------------------------------------------------------------------- -void ODBTable::refreshColumns() -{ - OTable_Base::refreshColumns(); -} // ----------------------------------------------------------------------------- sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException) { @@ -477,9 +472,8 @@ xMeta.is() && xMeta->supportsAlterTableWithDropColumn()); static_cast<OColumnsHelper*>(pCol)->setParent(this); pCol->setParent(*this); - OContainerMediator* pMediator = new OContainerMediator(pCol,m_xColumnDefinitions,sal_False); - m_xColumnMediator = pMediator; - pCol->setMediator(pMediator); + m_pColumnMediator = new OContainerMediator( pCol, m_xColumnDefinitions, getConnection(), OContainerMediator::eColumns ); + pCol->setMediator( m_pColumnMediator.get() ); return pCol; } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
