User: vg Date: 05/03/10 08:27:05 Modified: /dba/dbaccess/source/core/api/ CIndexColumns.cxx
Log: INTEGRATION: CWS dba24 (1.6.168); FILE MERGED 2005/02/09 08:12:55 oj 1.6.168.1: #i26950# remove the need for XNamed File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: CIndexColumns.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CIndexColumns.cxx?r1=1.6&r2=1.7 Delta lines: +5 -8 ------------------- --- CIndexColumns.cxx 1 Dec 2003 10:30:23 -0000 1.6 +++ CIndexColumns.cxx 10 Mar 2005 16:27:02 -0000 1.7 @@ -97,13 +97,13 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -Reference< XNamed > OIndexColumns::createObject(const ::rtl::OUString& _rName) +connectivity::sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) { ::rtl::OUString aSchema,aTable; m_pIndex->getTable()->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema; m_pIndex->getTable()->getPropertyValue(PROPERTY_NAME) >>= aTable; - Reference< XNamed > xRet = NULL; + connectivity::sdbcx::ObjectType xRet = NULL; Reference<XDatabaseMetaData> xMeta = m_pIndex->getTable()->getConnection()->getMetaData(); if ( xMeta.is() ) { @@ -170,13 +170,10 @@ m_pIndex->refreshColumns(); } // ----------------------------------------------------------------------------- -Reference< XNamed > OIndexColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) +connectivity::sdbcx::ObjectType OIndexColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) { - OIndexColumn* pColumn = new OIndexColumn(sal_True); - Reference<XPropertySet> xProp = pColumn; + Reference<XPropertySet> xProp = new OIndexColumn(sal_True); ::comphelper::copyProperties(_xDescriptor,xProp); - Reference< XNamed > xName(xProp,UNO_QUERY); - OSL_ENSURE(xName.is(),"Must be a XName interface here !"); - return xName; + return xProp; } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
