User: obo Date: 2006/07/10 07:25:00 Modified: dba/connectivity/source/drivers/dbase/DColumns.cxx
Log: INTEGRATION: CWS qiq (1.12.104); FILE MERGED 2006/06/27 14:14:17 fs 1.12.104.2: RESYNC: (1.12-1.13); FILE MERGED 2006/06/16 11:32:32 fs 1.12.104.1: during #i51143#: refactored VCollection: - createEmptyObject now named createDescriptor - cloneObject removed - appendObject now returns the newly created object (previously done via a subsequent call to cloneObject) File Changes: Directory: /dba/connectivity/source/drivers/dbase/ ================================================== File [changed]: DColumns.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/dbase/DColumns.cxx?r1=1.13&r2=1.14 Delta lines: +7 -16 -------------------- --- DColumns.cxx 20 Jun 2006 01:19:12 -0000 1.13 +++ DColumns.cxx 10 Jul 2006 14:24:58 -0000 1.14 @@ -80,17 +80,20 @@ m_pTable->refreshColumns(); } // ------------------------------------------------------------------------- -Reference< XPropertySet > ODbaseColumns::createEmptyObject() +Reference< XPropertySet > ODbaseColumns::createDescriptor() { return new sdbcx::OColumn(isCaseSensitive()); } // ----------------------------------------------------------------------------- // ------------------------------------------------------------------------- // XAppend -void ODbaseColumns::appendObject( const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType ODbaseColumns::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - if(!m_pTable->isNew()) - m_pTable->addColumn(descriptor); + if ( m_pTable->isNew() ) + return cloneDescriptor( descriptor ); + + m_pTable->addColumn( descriptor ); + return createObject( _rForName ); } // ----------------------------------------------------------------------------- // ------------------------------------------------------------------------- @@ -99,18 +102,6 @@ { if(!m_pTable->isNew()) m_pTable->dropColumn(_nPos); -} -// ----------------------------------------------------------------------------- -sdbcx::ObjectType ODbaseColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) -{ - if(m_pTable->isNew()) - { - Reference<XPropertySet> xProp = new sdbcx::OColumn(isCaseSensitive()); - ::comphelper::copyProperties(_xDescriptor,xProp); - return xProp; - } - - return ODbaseColumns_BASE::cloneObject(_xDescriptor); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
