User: obo Date: 2006/07/10 08:00:39 Modified: dba/dbaccess/source/core/api/CIndexes.cxx
Log: INTEGRATION: CWS qiq (1.15.118); FILE MERGED 2006/06/27 11:52:26 fs 1.15.118.2: RESYNC: (1.15-1.16); FILE MERGED 2006/06/16 11:47:36 fs 1.15.118.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/dbaccess/source/core/api/ ========================================= File [changed]: CIndexes.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CIndexes.cxx?r1=1.16&r2=1.17 Delta lines: +8 -7 ------------------- --- CIndexes.cxx 20 Jun 2006 02:33:22 -0000 1.16 +++ CIndexes.cxx 10 Jul 2006 15:00:36 -0000 1.17 @@ -81,23 +81,24 @@ return xRet; } // ------------------------------------------------------------------------- -Reference< XPropertySet > OIndexes::createEmptyObject() +Reference< XPropertySet > OIndexes::createDescriptor() { Reference<XDataDescriptorFactory> xData( m_xIndexes,UNO_QUERY); if(xData.is()) return xData->createDataDescriptor(); else - return OIndexesHelper::createEmptyObject(); + return OIndexesHelper::createDescriptor(); } // ------------------------------------------------------------------------- // XAppend -void OIndexes::appendObject( const Reference< XPropertySet >& descriptor ) +ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) { Reference<XAppend> xData( m_xIndexes,UNO_QUERY); - if ( xData.is() ) + if ( !xData.is() ) + return OIndexesHelper::appendObject( _rForName, descriptor ); + xData->appendByDescriptor(descriptor); - else - OIndexesHelper::appendObject(descriptor); + return createObject( _rForName ); } // ------------------------------------------------------------------------- // XDrop --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
