User: vg Date: 05/03/10 07:20:48 Modified: /dba/connectivity/source/drivers/adabas/ BKeyColumns.cxx
Log: INTEGRATION: CWS dba24 (1.9.260); FILE MERGED 2005/02/09 08:07:37 oj 1.9.260.1: #i26950# remove the need for XNamed File Changes: Directory: /dba/connectivity/source/drivers/adabas/ =================================================== File [changed]: BKeyColumns.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BKeyColumns.cxx?r1=1.9&r2=1.10 Delta lines: +8 -10 -------------------- --- BKeyColumns.cxx 9 Nov 2001 08:28:24 -0000 1.9 +++ BKeyColumns.cxx 10 Mar 2005 15:20:45 -0000 1.10 @@ -90,7 +90,7 @@ #include <comphelper/property.hxx> #endif - +using namespace connectivity; using namespace connectivity::adabas; using namespace connectivity::sdbcx; using namespace ::com::sun::star::uno; @@ -100,7 +100,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -Reference< XNamed > OKeyColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OKeyColumns::createObject(const ::rtl::OUString& _rName) { Reference< XResultSet > @@ -125,7 +125,7 @@ xResult = m_pKey->getTable()->getConnection()->getMetaData()->getColumns(Any(), m_pKey->getTable()->getSchema(),m_pKey->getTable()->getTableName(),_rName); - Reference< XNamed > xRet = NULL; + sdbcx::ObjectType xRet = NULL; if(xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); @@ -164,14 +164,12 @@ return new OKeyColumn(isCaseSensitive()); } // ------------------------------------------------------------------------- -Reference< XNamed > OKeyColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) +sdbcx::ObjectType OKeyColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) { OKeyColumn* pColumn = new OKeyColumn(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 OKeyColumns::impl_refresh() throw(::com::sun::star::uno::RuntimeException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
