must change for comphelper

8 files changed, 40 insertions, 37 deletions

diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index aaabb43338ad..faa3fe55eb3b 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VCollection.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:28 $
+ *  last change: $Author: oj $ $Date: 2000-10-09 12:06:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,6 +65,9 @@
 #ifndef _CONNECTIVITY_ENUMHELPER_HXX_
 #include "enumhelper.hxx"
 #endif
+#ifndef _COMPHELPER_CONTAINER_HXX_
+#include <comphelper/container.hxx>
+#endif
 
 using namespace connectivity::sdbcx;
 using namespace connectivity;
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index 84b8a0dd8985..324bc8210bae 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VColumn.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:28 $
+ *  last change: $Author: oj $ $Date: 2000-10-09 12:06:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,8 +67,8 @@
 #ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
 #include "propertyids.hxx"
 #endif
-#ifndef _UTL_SEQUENCE_HXX_
-#include <unotools/sequence.hxx>
+#ifndef _COMPHELPER_SEQUENCE_HXX_
+#include <comphelper/sequence.hxx>
 #endif
 
 // -------------------------------------------------------------------------
@@ -134,7 +134,7 @@ Any SAL_CALL OColumn::queryInterface( const Type & rType ) throw(RuntimeExceptio
 // -------------------------------------------------------------------------
 Sequence< Type > SAL_CALL OColumn::getTypes(  ) throw(RuntimeException)
 {
-    return ::utl::concatSequences(ODescriptor::getTypes(),OColumn_BASE::getTypes());
+    return ::comphelper::concatSequences(ODescriptor::getTypes(),OColumn_BASE::getTypes());
 }
 // -------------------------------------------------------------------------
 void OColumn::construct()
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index 4143e1513f13..5d048f45e789 100644
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VGroup.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:28 $
+ *  last change: $Author: oj $ $Date: 2000-10-09 12:06:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,8 +75,8 @@
 #ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
 #include "propertyids.hxx"
 #endif
-#ifndef _UTL_SEQUENCE_HXX_
-#include <unotools/sequence.hxx>
+#ifndef _COMPHELPER_SEQUENCE_HXX_
+#include <comphelper/sequence.hxx>
 #endif
 
 
@@ -114,7 +114,7 @@ Any SAL_CALL OGroup::queryInterface( const Type & rType ) throw(RuntimeException
 // -------------------------------------------------------------------------
 Sequence< Type > SAL_CALL OGroup::getTypes(  ) throw(RuntimeException)
 {
-    return ::utl::concatSequences(ODescriptor::getTypes(),OGroup_BASE::getTypes());
+    return ::comphelper::concatSequences(ODescriptor::getTypes(),OGroup_BASE::getTypes());
 }
 // -------------------------------------------------------------------------
 void OGroup::disposing(void)
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index 982a51908e5b..29ee82839c19 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VIndex.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:28 $
+ *  last change: $Author: oj $ $Date: 2000-10-09 12:06:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,8 +71,8 @@
 #ifndef _CONNECTIVITY_SDBCX_COLUMN_HXX_
 #include "connectivity/sdbcx/VColumn.hxx"
 #endif
-#ifndef _UTL_SEQUENCE_HXX_
-#include <unotools/sequence.hxx>
+#ifndef _COMPHELPER_SEQUENCE_HXX_
+#include <comphelper/sequence.hxx>
 #endif
 // -------------------------------------------------------------------------
 using namespace connectivity;
@@ -119,7 +119,7 @@ Any SAL_CALL OIndex::queryInterface( const Type & rType ) throw(RuntimeException
 // -------------------------------------------------------------------------
 Sequence< Type > SAL_CALL OIndex::getTypes(  ) throw(RuntimeException)
 {
-    return ::utl::concatSequences(ODescriptor::getTypes(),OColumns_BASE::getTypes());
+    return ::comphelper::concatSequences(ODescriptor::getTypes(),OColumns_BASE::getTypes());
 }
 // -------------------------------------------------------------------------
 void OIndex::construct()
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index 999d4a4c6c46..c5b145163eb5 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VKey.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:28 $
+ *  last change: $Author: oj $ $Date: 2000-10-09 12:06:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,8 +73,8 @@
 #ifndef _CONNECTIVITY_SDBCX_COLUMN_HXX_
 #include "connectivity/sdbcx/VColumn.hxx"
 #endif
-#ifndef _UTL_SEQUENCE_HXX_
-#include <unotools/sequence.hxx>
+#ifndef _COMPHELPER_SEQUENCE_HXX_
+#include <comphelper/sequence.hxx>
 #endif
 #ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
 #include "propertyids.hxx"
@@ -123,7 +123,7 @@ Any SAL_CALL OKey::queryInterface( const Type & rType ) throw(RuntimeException)
 // -------------------------------------------------------------------------
 Sequence< Type > SAL_CALL OKey::getTypes(  ) throw(RuntimeException)
 {
-    return ::utl::concatSequences(ODescriptor::getTypes(),OColumns_BASE::getTypes());
+    return ::comphelper::concatSequences(ODescriptor::getTypes(),OColumns_BASE::getTypes());
 }
 // -------------------------------------------------------------------------
 void OKey::construct()
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index d833b5c756f7..ebef6d33004e 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VTable.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:29 $
+ *  last change: $Author: oj $ $Date: 2000-10-09 12:06:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,8 +78,8 @@
 #ifndef _CONNECTIVITY_SDBCX_INDEX_HXX_
 #include "connectivity/sdbcx/VIndex.hxx"
 #endif
-#ifndef _UTL_SEQUENCE_HXX_
-#include <unotools/sequence.hxx>
+#ifndef _COMPHELPER_SEQUENCE_HXX_
+#include <comphelper/sequence.hxx>
 #endif
 
 // -------------------------------------------------------------------------
@@ -128,7 +128,7 @@ Any SAL_CALL OTable::queryInterface( const Type & rType ) throw(RuntimeException
 // -------------------------------------------------------------------------
 Sequence< Type > SAL_CALL OTable::getTypes(  ) throw(RuntimeException)
 {
-    return ::utl::concatSequences(ODescriptor::getTypes(),OTable_BASE::getTypes());
+    return ::comphelper::concatSequences(ODescriptor::getTypes(),OTable_BASE::getTypes());
 }
 // -------------------------------------------------------------------------
 void OTable::construct()
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index 5a2ba05efa9d..b121b38bb570 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VUser.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:29 $
+ *  last change: $Author: oj $ $Date: 2000-10-09 12:06:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,8 +76,8 @@
 #ifndef _CONNECTIVITY_SDBCX_COLLECTION_HXX_
 #include "connectivity/sdbcx/VCollection.hxx"
 #endif
-#ifndef _UTL_SEQUENCE_HXX_
-#include <unotools/sequence.hxx>
+#ifndef _COMPHELPER_SEQUENCE_HXX_
+#include <comphelper/sequence.hxx>
 #endif
 
 // -------------------------------------------------------------------------
@@ -122,7 +122,7 @@ Any SAL_CALL OUser::queryInterface( const Type & rType ) throw(RuntimeException)
 // -------------------------------------------------------------------------
 Sequence< Type > SAL_CALL OUser::getTypes(  ) throw(RuntimeException)
 {
-    return ::utl::concatSequences(ODescriptor::getTypes(),OUser_BASE::getTypes());
+    return ::comphelper::concatSequences(ODescriptor::getTypes(),OUser_BASE::getTypes());
 }
 // -------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper* OUser::createArrayHelper( ) const
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index c96fb19dd707..ba0fdaa895aa 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VView.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:29 $
+ *  last change: $Author: oj $ $Date: 2000-10-09 12:06:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,8 +67,8 @@
 #ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
 #include "propertyids.hxx"
 #endif
-#ifndef _UTL_SEQUENCE_HXX_
-#include <unotools/sequence.hxx>
+#ifndef _COMPHELPER_SEQUENCE_HXX_
+#include <comphelper/sequence.hxx>
 #endif
 // -------------------------------------------------------------------------
 using namespace connectivity;
@@ -125,7 +125,7 @@ Sequence< Type > SAL_CALL OView::getTypes(  ) throw(RuntimeException)
         aTypes.getArray()[0] = ::getCppuType(static_cast< Reference< ::com::sun::star::container::XNamed> *> (NULL));
         aTypes.getArray()[1] = ::getCppuType(static_cast< Reference< XServiceInfo> *> (NULL));
 
-    return ::utl::concatSequences(ODescriptor::getTypes(),aTypes);
+    return ::comphelper::concatSequences(ODescriptor::getTypes(),aTypes);
 }
 // -------------------------------------------------------------------------
 Any SAL_CALL OView::queryInterface( const Type & rType ) throw(RuntimeException)