User: vg Date: 05/03/10 07:17:20 Modified: /dba/connectivity/source/commontools/ TIndexColumns.cxx
Log: INTEGRATION: CWS dba24 (1.1.240); FILE MERGED 2005/02/09 08:07:34 oj 1.1.240.1: #i26950# remove the need for XNamed File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: TIndexColumns.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/TIndexColumns.cxx?r1=1.1&r2=1.2 Delta lines: +8 -11 -------------------- --- TIndexColumns.cxx 25 Oct 2002 09:01:47 -0000 1.1 +++ TIndexColumns.cxx 10 Mar 2005 15:17:17 -0000 1.2 @@ -107,7 +107,7 @@ { } // ------------------------------------------------------------------------- -Reference< XNamed > OIndexColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString aSchema,aTable; @@ -134,7 +134,7 @@ m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)), aSchema,aTable,_rName); - Reference< XNamed > xRet = NULL; + sdbcx::ObjectType xRet = NULL; if ( xResult.is() ) { Reference< XRow > xRow(xResult,UNO_QUERY); @@ -177,13 +177,10 @@ m_pIndex->refreshColumns(); } // ----------------------------------------------------------------------------- -Reference< XNamed > OIndexColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) +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]
