User: vg Date: 05/03/10 07:25:03 Modified: /dba/connectivity/source/drivers/dbase/ DColumns.cxx
Log: INTEGRATION: CWS dba24 (1.10.260); FILE MERGED 2005/02/09 08:07:41 oj 1.10.260.1: #i26950# remove the need for XNamed File Changes: Directory: /dba/connectivity/source/drivers/dbase/ ================================================== File [changed]: DColumns.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/dbase/DColumns.cxx?r1=1.10&r2=1.11 Delta lines: +10 -16 --------------------- --- DColumns.cxx 9 Nov 2001 06:12:48 -0000 1.10 +++ DColumns.cxx 10 Mar 2005 15:25:01 -0000 1.11 @@ -85,7 +85,7 @@ using namespace ::com::sun::star::container; typedef file::OColumns ODbaseColumns_BASE; -Reference< XNamed > ODbaseColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType ODbaseColumns::createObject(const ::rtl::OUString& _rName) { ODbaseTable* pTable = (ODbaseTable*)m_pTable; @@ -94,9 +94,9 @@ ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns(); OSQLColumns::const_iterator aIter = find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); - Reference< XNamed > xRet; + sdbcx::ObjectType xRet; if(aIter != aCols->end()) - xRet = Reference< XNamed >(*aIter,UNO_QUERY); + xRet = sdbcx::ObjectType(*aIter,UNO_QUERY); return xRet; } @@ -127,22 +127,16 @@ m_pTable->dropColumn(_nPos); } // ----------------------------------------------------------------------------- -Reference< XNamed > ODbaseColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) +sdbcx::ObjectType ODbaseColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) { if(m_pTable->isNew()) { - sdbcx::OColumn* pColumn = new sdbcx::OColumn(isCaseSensitive()); - Reference<XPropertySet> xProp = pColumn; + Reference<XPropertySet> xProp = new sdbcx::OColumn(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; } - ::rtl::OUString sColumnName; - if(_xDescriptor.is()) - _xDescriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= sColumnName; - return createObject(sColumnName); + return ODbaseColumns_BASE::cloneObject(_xDescriptor); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
