diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 14:17:17 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 14:17:17 +0000 |
| commit | 126b3f326654186ef6708f531912b7b9faca587c (patch) | |
| tree | 4cbddb4438c4efe05b2022401be0c52c3f987fa0 /connectivity/source/commontools/TIndexColumns.cxx | |
| parent | 5db843ee0f10b3a7d82d2c39d33dc0b80b429697 (diff) | |
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
Diffstat (limited to 'connectivity/source/commontools/TIndexColumns.cxx')
| -rw-r--r-- | connectivity/source/commontools/TIndexColumns.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx index 406891f12876..0b2828ff82c2 100644 --- a/connectivity/source/commontools/TIndexColumns.cxx +++ b/connectivity/source/commontools/TIndexColumns.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TIndexColumns.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: oj $ $Date: 2002-10-25 09:01:47 $ + * last change: $Author: vg $ $Date: 2005-03-10 15:17:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -107,7 +107,7 @@ OIndexColumns::OIndexColumns( OIndexHelper* _pIndex, { } // ------------------------------------------------------------------------- -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 @@ Reference< XNamed > OIndexColumns::createObject(const ::rtl::OUString& _rName) 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 @@ void OIndexColumns::impl_refresh() throw(RuntimeException) 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; } // ----------------------------------------------------------------------------- |