User: vg Date: 05/03/10 07:18:20 Modified: /dba/connectivity/source/commontools/ TKeys.cxx
Log: INTEGRATION: CWS dba24 (1.5.52); FILE MERGED 2005/02/09 08:07:35 oj 1.5.52.1: #i26950# remove the need for XNamed File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: TKeys.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/TKeys.cxx?r1=1.5&r2=1.6 Delta lines: +7 -10 -------------------- --- TKeys.cxx 2 Aug 2004 16:52:13 -0000 1.5 +++ TKeys.cxx 10 Mar 2005 15:18:18 -0000 1.6 @@ -116,9 +116,9 @@ { } // ------------------------------------------------------------------------- -Reference< XNamed > OKeysHelper::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OKeysHelper::createObject(const ::rtl::OUString& _rName) { - Reference< XNamed > xRet = NULL; + sdbcx::ObjectType xRet = NULL; if(_rName.getLength()) { @@ -342,14 +342,12 @@ } } // ----------------------------------------------------------------------------- -Reference< XNamed > OKeysHelper::cloneObject(const Reference< XPropertySet >& _xDescriptor) +sdbcx::ObjectType OKeysHelper::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 >(); + xName = OKeys_BASE::cloneObject(_xDescriptor); } else { @@ -362,11 +360,10 @@ sal_Int32 nCount = xIndex->getCount(); for(sal_Int32 i=0;i< nCount;++i) { - Reference<XPropertySet> xColProp; - xIndex->getByIndex(i) >>= xColProp; + Reference<XPropertySet> xColProp(xIndex->getByIndex(i),UNO_QUERY); xAppend->appendByDescriptor(xColProp); } - xName = Reference< XNamed >(xProp,UNO_QUERY); + xName = xProp; } return xName; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
