User: vg Date: 05/03/10 08:31:57 Modified: /dba/dbaccess/source/core/api/ column.cxx
Log: INTEGRATION: CWS dba24 (1.46.50); FILE MERGED 2005/02/21 13:08:13 oj 1.46.50.2: RESYNC: (1.46-1.47); FILE MERGED 2005/02/09 08:12:58 oj 1.46.50.1: #i26950# remove the need for XNamed File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: column.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/column.cxx?r1=1.47&r2=1.48 Delta lines: +4 -6 ------------------- --- column.cxx 17 Feb 2005 11:02:32 -0000 1.47 +++ column.cxx 10 Mar 2005 16:31:54 -0000 1.48 @@ -656,11 +656,11 @@ } // ------------------------------------------------------------------------- -Reference< XNamed > OColumns::createObject(const ::rtl::OUString& _rName) +connectivity::sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) { OSL_ENSURE(m_pColFactoryImpl, "OColumns::createObject: no column factory!"); - Reference< XNamed > xRet; + connectivity::sdbcx::ObjectType xRet; if ( m_pColFactoryImpl ) { xRet = m_pColFactoryImpl->createColumn(_rName); @@ -803,17 +803,15 @@ ::dbaccess::notifyDataSourceModified(m_xParent,sal_True); } // ------------------------------------------------------------------------- -Reference< XNamed > OColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) +connectivity::sdbcx::ObjectType OColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) { Reference<XPropertySet> xProp = createEmptyObject(); - Reference< XNamed > xName(xProp,UNO_QUERY); - OSL_ENSURE(xName.is(),"Must be a XName interface here !"); if ( xProp.is() ) ::comphelper::copyProperties(_xDescriptor,xProp); if ( m_pColFactoryImpl ) m_pColFactoryImpl->columnCloned(xProp); - return xName; + return xProp; } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
