User: vg Date: 05/03/10 07:18:04 Modified: /dba/connectivity/source/commontools/ TKeyColumns.cxx
Log: INTEGRATION: CWS dba24 (1.1.240); FILE MERGED 2005/02/09 08:07:35 oj 1.1.240.1: #i26950# remove the need for XNamed File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: TKeyColumns.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/TKeyColumns.cxx?r1=1.1&r2=1.2 Delta lines: +8 -11 -------------------- --- TKeyColumns.cxx 25 Oct 2002 09:01:21 -0000 1.1 +++ TKeyColumns.cxx 10 Mar 2005 15:18:01 -0000 1.2 @@ -108,7 +108,7 @@ { } // ------------------------------------------------------------------------- -Reference< XNamed > OKeyColumnsHelper::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OKeyColumnsHelper::createObject(const ::rtl::OUString& _rName) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString aSchema,aTable; @@ -135,7 +135,7 @@ } } - Reference< XNamed > xRet; + sdbcx::ObjectType xRet; // now describe the column _rName and set his related column xResult = m_pKey->getTable()->getMetaData()->getColumns( @@ -193,14 +193,11 @@ m_pKey->refreshColumns(); } // ----------------------------------------------------------------------------- -Reference< XNamed > OKeyColumnsHelper::cloneObject(const Reference< XPropertySet >& _xDescriptor) +sdbcx::ObjectType OKeyColumnsHelper::cloneObject(const Reference< XPropertySet >& _xDescriptor) { - OKeyColumn* pColumn = new OKeyColumn(isCaseSensitive()); - Reference<XPropertySet> xProp = pColumn; + Reference<XPropertySet> xProp = new OKeyColumn(isCaseSensitive()); ::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]
