User: vg Date: 05/03/10 07:20:15 Modified: /dba/connectivity/source/drivers/adabas/ BIndexColumns.cxx
Log: INTEGRATION: CWS dba24 (1.7.262); FILE MERGED 2005/02/09 08:07:36 oj 1.7.262.1: #i26950# remove the need for XNamed File Changes: Directory: /dba/connectivity/source/drivers/adabas/ =================================================== File [changed]: BIndexColumns.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BIndexColumns.cxx?r1=1.7&r2=1.8 Delta lines: +7 -9 ------------------- --- BIndexColumns.cxx 12 Oct 2001 11:39:41 -0000 1.7 +++ BIndexColumns.cxx 10 Mar 2005 15:20:12 -0000 1.8 @@ -99,7 +99,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -Reference< XNamed > OIndexColumns::createObject(const ::rtl::OUString& _rName) +ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) { Reference< XResultSet > xResult = m_pIndex->getTable()->getConnection()->getMetaData()->getIndexInfo(Any(), @@ -121,7 +121,7 @@ xResult = m_pIndex->getTable()->getConnection()->getMetaData()->getColumns(Any(), m_pIndex->getTable()->getSchema(),m_pIndex->getTable()->getTableName(),_rName); - Reference< XNamed > xRet = NULL; + ObjectType xRet = NULL; if(xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); @@ -158,14 +158,12 @@ return new OIndexColumn(sal_True); } // ------------------------------------------------------------------------- -Reference< XNamed > OIndexColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) +ObjectType OIndexColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) { OIndexColumn* pColumn = new OIndexColumn(sal_True); Reference<XPropertySet> xProp = pColumn; ::comphelper::copyProperties(_xDescriptor,xProp); - Reference< XNamed > xName(xProp,UNO_QUERY); - OSL_ENSURE(xName.is(),"Must be a XName interface here !"); - return xName; + return xProp; } // ----------------------------------------------------------------------------- void OIndexColumns::impl_refresh() throw(::com::sun::star::uno::RuntimeException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
