diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 13:24:58 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 13:24:58 +0000 |
| commit | b0e8a2bc7f27dbd88886bf8fcde6e0cfbc56a1d2 (patch) | |
| tree | f7f4893d8f2ab601d1f5e5257fd43c1e4e320dea /connectivity/source/drivers | |
| parent | bddf89c7e887bb57936215ad9923b131c58a3cd1 (diff) | |
INTEGRATION: CWS qiq (1.12.104); FILE MERGED
2006/06/27 14:14:17 fs 1.12.104.2: RESYNC: (1.12-1.13); FILE MERGED
2006/06/16 11:32:32 fs 1.12.104.1: during #i51143#:
refactored VCollection:
- createEmptyObject now named createDescriptor
- cloneObject removed
- appendObject now returns the newly created object
(previously done via a subsequent call to cloneObject)
Diffstat (limited to 'connectivity/source/drivers')
| -rw-r--r-- | connectivity/source/drivers/dbase/DColumns.cxx | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx index a6d8aa12ea2d..f3f4ddd910a1 100644 --- a/connectivity/source/drivers/dbase/DColumns.cxx +++ b/connectivity/source/drivers/dbase/DColumns.cxx @@ -4,9 +4,9 @@ * * $RCSfile: DColumns.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: hr $ $Date: 2006-06-20 01:19:12 $ + * last change: $Author: obo $ $Date: 2006-07-10 14:24:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -80,17 +80,20 @@ void ODbaseColumns::impl_refresh() throw(RuntimeException) m_pTable->refreshColumns(); } // ------------------------------------------------------------------------- -Reference< XPropertySet > ODbaseColumns::createEmptyObject() +Reference< XPropertySet > ODbaseColumns::createDescriptor() { return new sdbcx::OColumn(isCaseSensitive()); } // ----------------------------------------------------------------------------- // ------------------------------------------------------------------------- // XAppend -void ODbaseColumns::appendObject( const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType ODbaseColumns::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - if(!m_pTable->isNew()) - m_pTable->addColumn(descriptor); + if ( m_pTable->isNew() ) + return cloneDescriptor( descriptor ); + + m_pTable->addColumn( descriptor ); + return createObject( _rForName ); } // ----------------------------------------------------------------------------- // ------------------------------------------------------------------------- @@ -101,16 +104,4 @@ void ODbaseColumns::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElement m_pTable->dropColumn(_nPos); } // ----------------------------------------------------------------------------- -sdbcx::ObjectType ODbaseColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) -{ - if(m_pTable->isNew()) - { - Reference<XPropertySet> xProp = new sdbcx::OColumn(isCaseSensitive()); - ::comphelper::copyProperties(_xDescriptor,xProp); - return xProp; - } - - return ODbaseColumns_BASE::cloneObject(_xDescriptor); -} -// ----------------------------------------------------------------------------- |