User: vg Date: 05/03/10 07:25:29 Modified: /dba/connectivity/source/drivers/dbase/ DIndexColumns.cxx
Log: INTEGRATION: CWS dba24 (1.9.262); FILE MERGED 2005/02/09 08:07:42 oj 1.9.262.1: #i26950# remove the need for XNamed File Changes: Directory: /dba/connectivity/source/drivers/dbase/ ================================================== File [changed]: DIndexColumns.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/dbase/DIndexColumns.cxx?r1=1.9&r2=1.10 Delta lines: +9 -13 -------------------- --- DIndexColumns.cxx 12 Oct 2001 11:46:05 -0000 1.9 +++ DIndexColumns.cxx 10 Mar 2005 15:25:26 -0000 1.10 @@ -86,7 +86,7 @@ using namespace ::com::sun::star::container; -Reference< XNamed > ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName) { const ODbaseTable* pTable = m_pIndex->getTable(); @@ -98,9 +98,9 @@ xCol = *aIter; if(!xCol.is()) - return Reference< XNamed >(); + return sdbcx::ObjectType(); - Reference< XNamed > xRet = new sdbcx::OIndexColumn(sal_True,_rName + sdbcx::ObjectType xRet = new sdbcx::OIndexColumn(sal_True,_rName ,getString(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))) ,::rtl::OUString() ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))) @@ -126,15 +126,11 @@ return new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers()); } // ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- -Reference< XNamed > ODbaseIndexColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) +sdbcx::ObjectType ODbaseIndexColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) { - sdbcx::OIndexColumn* pColumn = new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers()); - Reference<XPropertySet> xProp = pColumn; + Reference<XPropertySet> xProp = new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers()); ::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 ODbaseIndexColumns::appendObject( const Reference< XPropertySet >& descriptor ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
