diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 14:25:26 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 14:25:26 +0000 |
| commit | 663e41a7d51a97d2f645f78a241c98f0f2bad76b (patch) | |
| tree | d9bd22b6affd362da73134d01f39b07e6f64a873 /connectivity/source/drivers/dbase/DIndexColumns.cxx | |
| parent | 6344d0e090ed256d43c6c8a32f66893f6a6cac13 (diff) | |
INTEGRATION: CWS dba24 (1.9.262); FILE MERGED
2005/02/09 08:07:42 oj 1.9.262.1: #i26950# remove the need for XNamed
Diffstat (limited to 'connectivity/source/drivers/dbase/DIndexColumns.cxx')
| -rw-r--r-- | connectivity/source/drivers/dbase/DIndexColumns.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx index 09589d23a06e..3a15ce392079 100644 --- a/connectivity/source/drivers/dbase/DIndexColumns.cxx +++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DIndexColumns.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: oj $ $Date: 2001-10-12 11:46:05 $ + * last change: $Author: vg $ $Date: 2005-03-10 15:25:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,7 +86,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; -Reference< XNamed > ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName) { const ODbaseTable* pTable = m_pIndex->getTable(); @@ -98,9 +98,9 @@ Reference< XNamed > ODbaseIndexColumns::createObject(const ::rtl::OUString& _rNa xCol = *aIter; if(!xCol.is()) - return Reference< XNamed >(); + return sdbcx::ObjectType(); - Reference< XNamed > xRet = new sdbcx::OIndexColumn(sal_True,_rName + sdbcx::ObjectType xRet = new sdbcx::OIndexColumn(sal_True,_rName ,getString(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))) ,::rtl::OUString() ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))) @@ -126,15 +126,11 @@ Reference< XPropertySet > ODbaseIndexColumns::createEmptyObject() return new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers()); } // ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- -Reference< XNamed > ODbaseIndexColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) +sdbcx::ObjectType ODbaseIndexColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) { - sdbcx::OIndexColumn* pColumn = new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers()); - Reference<XPropertySet> xProp = pColumn; + Reference<XPropertySet> xProp = new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers()); ::comphelper::copyProperties(_xDescriptor,xProp); - Reference< XNamed > xName(xProp,UNO_QUERY); - OSL_ENSURE(xName.is(),"Must be a XName interface here !"); - return xName; + return xProp; } // ------------------------------------------------------------------------- void ODbaseIndexColumns::appendObject( const Reference< XPropertySet >& descriptor ) |