User: obo Date: 2006/07/10 07:26:04 Modified: dba/connectivity/source/drivers/dbase/DTables.cxx
Log: INTEGRATION: CWS qiq (1.23.104); FILE MERGED 2006/06/27 14:16:33 fs 1.23.104.2: RESYNC: (1.23-1.24); FILE MERGED 2006/06/16 11:32:33 fs 1.23.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]: DTables.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/dbase/DTables.cxx?r1=1.24&r2=1.25 Delta lines: +4 -3 ------------------- --- DTables.cxx 20 Jun 2006 01:21:24 -0000 1.24 +++ DTables.cxx 10 Jul 2006 14:26:02 -0000 1.25 @@ -98,14 +98,14 @@ static_cast<ODbaseCatalog*>(&m_rParent)->refreshTables(); } // ------------------------------------------------------------------------- -Reference< XPropertySet > ODbaseTables::createEmptyObject() +Reference< XPropertySet > ODbaseTables::createDescriptor() { return new ODbaseTable(this,(ODbaseConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection()); } typedef connectivity::sdbcx::OCollection ODbaseTables_BASE_BASE; // ------------------------------------------------------------------------- // XAppend -void ODbaseTables::appendObject( const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType ODbaseTables::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) { Reference<XUnoTunnel> xTunnel(descriptor,UNO_QUERY); if(xTunnel.is()) @@ -113,7 +113,7 @@ ODbaseTable* pTable = reinterpret_cast< ODbaseTable* >( xTunnel->getSomething(ODbaseTable::getUnoTunnelImplementationId()) ); if(pTable) { - pTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); + pTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(_rForName)); try { if(!pTable->CreateImpl()) @@ -129,6 +129,7 @@ } } } + return createObject( _rForName ); } // ------------------------------------------------------------------------- // XDrop --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
