User: vg Date: 05/03/10 07:20:30 Modified: /dba/connectivity/source/drivers/adabas/ BIndexes.cxx
Log: INTEGRATION: CWS dba24 (1.18.32); FILE MERGED 2005/02/09 08:07:37 oj 1.18.32.1: #i26950# remove the need for XNamed File Changes: Directory: /dba/connectivity/source/drivers/adabas/ =================================================== File [changed]: BIndexes.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BIndexes.cxx?r1=1.18&r2=1.19 Delta lines: +6 -11 -------------------- --- BIndexes.cxx 22 Oct 2004 08:41:37 -0000 1.18 +++ BIndexes.cxx 10 Mar 2005 15:20:26 -0000 1.19 @@ -94,7 +94,7 @@ using namespace ::comphelper; - +using namespace connectivity; using namespace connectivity::adabas; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -104,7 +104,7 @@ using namespace ::com::sun::star::lang; typedef connectivity::sdbcx::OCollection OCollection_TYPE; -Reference< XNamed > OIndexes::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OIndexes::createObject(const ::rtl::OUString& _rName) { ::rtl::OUString aName,aQualifier; sal_Int32 nLen = _rName.indexOf('.'); @@ -120,7 +120,7 @@ Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getIndexInfo(Any(), m_pTable->getSchema(),m_pTable->getTableName(),sal_False,sal_False); - Reference< XNamed > xRet = NULL; + sdbcx::ObjectType xRet = NULL; if(xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); @@ -151,17 +151,12 @@ return new OAdabasIndex(m_pTable); } // ------------------------------------------------------------------------- -Reference< XNamed > OIndexes::cloneObject(const Reference< XPropertySet >& _xDescriptor) +sdbcx::ObjectType OIndexes::cloneObject(const Reference< XPropertySet >& _xDescriptor) { - Reference< XNamed > xName; + sdbcx::ObjectType xName; if(!m_pTable->isNew()) { - xName = Reference< XNamed >(_xDescriptor,UNO_QUERY); - OSL_ENSURE(xName.is(),"Must be a XName interface here !"); - xName = xName.is() ? createObject(xName->getName()) : Reference< XNamed >(); - } - else - { + xName = OCollection_TYPE::cloneObject(_xDescriptor); } return xName; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
