INTEGRATION: CWS qiq (1.3.104); FILE MERGED

2006/06/16 11:32:27 fs 1.3.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)

2 files changed, 7 insertions, 8 deletions

diff --git a/connectivity/inc/connectivity/TIndexColumns.hxx b/connectivity/inc/connectivity/TIndexColumns.hxx
index c1391ffae16a..c794fe0577e4 100644
--- a/connectivity/inc/connectivity/TIndexColumns.hxx
+++ b/connectivity/inc/connectivity/TIndexColumns.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: TIndexColumns.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:58:58 $
+ *  last change: $Author: obo $ $Date: 2006-07-10 14:15:25 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -49,9 +49,8 @@ namespace connectivity
         OIndexHelper* m_pIndex;
     protected:
         virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createEmptyObject();
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor();
         virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
-        virtual sdbcx::ObjectType cloneObject(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDescriptor);
     public:
         OIndexColumns(  OIndexHelper* _pIndex,
                         ::osl::Mutex& _rMutex,
diff --git a/connectivity/inc/connectivity/TIndexes.hxx b/connectivity/inc/connectivity/TIndexes.hxx
index 4093d782a507..8e0aa6bbd9d2 100644
--- a/connectivity/inc/connectivity/TIndexes.hxx
+++ b/connectivity/inc/connectivity/TIndexes.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: TIndexes.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:59:12 $
+ *  last change: $Author: obo $ $Date: 2006-07-10 14:15:36 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -52,8 +52,8 @@ namespace connectivity
     protected:
         virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
         virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createEmptyObject();
-        virtual void appendObject( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor();
+        virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
         virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
     public:
         OIndexesHelper(OTableHelper* _pTable,