User: obo Date: 2006/07/10 08:01:09 Modified: dba/dbaccess/source/core/api/CKeys.cxx
Log: INTEGRATION: CWS qiq (1.23.124); FILE MERGED 2006/06/16 11:47:36 fs 1.23.124.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]: CKeys.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CKeys.cxx?r1=1.23&r2=1.24 Delta lines: +8 -8 ------------------- --- CKeys.cxx 8 Sep 2005 09:54:45 -0000 1.23 +++ CKeys.cxx 10 Jul 2006 15:01:06 -0000 1.24 @@ -122,24 +122,24 @@ return xRet; } // ------------------------------------------------------------------------- -Reference< XPropertySet > OKeys::createEmptyObject() +Reference< XPropertySet > OKeys::createDescriptor() { Reference<XDataDescriptorFactory> xDataFac(m_xMasterKeys,UNO_QUERY); if ( xDataFac.is() ) return xDataFac->createDataDescriptor(); - return OCollection_TYPE::createEmptyObject(); + return OCollection_TYPE::createDescriptor(); } // ------------------------------------------------------------------------- // XAppend -void OKeys::appendObject( const Reference< XPropertySet >& descriptor ) +ObjectType OKeys::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) { Reference<XAppend> xAppend(m_xMasterKeys,UNO_QUERY); - if ( xAppend.is() ) - xAppend->appendByDescriptor(descriptor); - else - OCollection_TYPE::appendObject( descriptor ); + if ( !xAppend.is() ) + return OCollection_TYPE::appendObject( _rForName, descriptor ); + xAppend->appendByDescriptor(descriptor); + return createObject( _rForName ); } // ------------------------------------------------------------------------- // XDrop --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
