diff options
| author | Frank Schönheit <fs@openoffice.org> | 2000-10-11 09:48:50 +0000 |
|---|---|---|
| committer | Frank Schönheit <fs@openoffice.org> | 2000-10-11 09:48:50 +0000 |
| commit | e3c7a2c360b957b81c7c07f715706a6cb7f1abcc (patch) | |
| tree | 575c8a2fa059c2398482524204a00b23f92631bd /connectivity | |
| parent | 913e13aaae9e5596525e35fafd5dd9540edd8e8c (diff) | |
replace unotools with comphelper
Diffstat (limited to 'connectivity')
38 files changed, 201 insertions, 206 deletions
diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx index dfa1bd28f3d8..25e32bbb7e7d 100644 --- a/connectivity/inc/connectivity/CommonTools.hxx +++ b/connectivity/inc/connectivity/CommonTools.hxx @@ -2,9 +2,9 @@ * * $RCSfile: CommonTools.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:18 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:48:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,8 +73,8 @@ #ifndef _CPPUHELPER_WEAKREF_HXX_ #include <cppuhelper/weakref.hxx> #endif -#ifndef _UTL_STLTYPES_HXX_ -#include <unotools/stl_types.hxx> +#ifndef _COMPHELPER_STLTYPES_HXX_ +#include <comphelper/stl_types.hxx> #endif #ifndef _COM_SUN_STAR_BEANS_XFASTPROPERTYSET_HPP_ #include <com/sun/star/beans/XFastPropertySet.hpp> @@ -149,7 +149,7 @@ namespace connectivity typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> OSQLTable; - DECLARE_STL_MAP(::rtl::OUString,OSQLTable,utl::UStringMixLess, OSQLTables); + DECLARE_STL_MAP(::rtl::OUString,OSQLTable,comphelper::UStringMixLess, OSQLTables); // ------------------------------------------------------------------------- // class ORefVector allows reference counting on a std::vector @@ -193,14 +193,14 @@ namespace connectivity OSQLColumns::const_iterator find( OSQLColumns::const_iterator __first, OSQLColumns::const_iterator __last, const ::rtl::OUString& _rVal, - const ::utl::UStringMixEqual& _rCase); + const ::comphelper::UStringMixEqual& _rCase); // ======================================================================================= // search from __first to __last the column with the realname _rVal // when no such column exist __last is returned OSQLColumns::const_iterator findRealName( OSQLColumns::const_iterator __first, OSQLColumns::const_iterator __last, const ::rtl::OUString& _rVal, - const ::utl::UStringMixEqual& _rCase); + const ::comphelper::UStringMixEqual& _rCase); // ======================================================================================= // the first two find methods are much faster than the one below @@ -211,7 +211,7 @@ namespace connectivity OSQLColumns::const_iterator __last, const ::rtl::OUString& _rProp, const ::rtl::OUString& _rVal, - const ::utl::UStringMixEqual& _rCase); + const ::comphelper::UStringMixEqual& _rCase); } //================================================================================== diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx index 25e5111299ea..4be8a541a7ef 100644 --- a/connectivity/inc/connectivity/PColumn.hxx +++ b/connectivity/inc/connectivity/PColumn.hxx @@ -2,9 +2,9 @@ * * $RCSfile: PColumn.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:18 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:48:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,7 @@ namespace connectivity class OParseColumn; typedef sdbcx::OColumn OParseColumn_BASE; - typedef ::utl::OPropertyArrayUsageHelper<OParseColumn> OParseColumn_PROP; + typedef ::comphelper::OPropertyArrayUsageHelper<OParseColumn> OParseColumn_PROP; class OParseColumn : public OParseColumn_BASE, public OParseColumn_PROP diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx index 90d7d2d23f45..1a2b89d085e1 100644 --- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx +++ b/connectivity/inc/connectivity/sdbcx/VCollection.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VCollection.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: oj $ $Date: 2000-10-09 12:09:06 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,8 +101,8 @@ #ifndef _COM_SUN_STAR_SDBC_XCOLUMNLOCATE_HPP_ #include <com/sun/star/sdbc/XColumnLocate.hpp> #endif -#ifndef _UTL_STLTYPES_HXX_ -#include <unotools/stl_types.hxx> +#ifndef _COMPHELPER_STLTYPES_HXX_ +#include <comphelper/stl_types.hxx> #endif #ifndef _CPPUHELPER_INTERFACECONTAINER_H_ #include <cppuhelper/interfacecontainer.h> @@ -140,7 +140,7 @@ namespace connectivity { protected: - typedef ::std::map< ::rtl::OUString, Object_BASE, ::utl::UStringMixLess> ObjectMap; + typedef ::std::map< ::rtl::OUString, Object_BASE, ::comphelper::UStringMixLess> ObjectMap; typedef ObjectMap::iterator ObjectIter; // this combination of map and vector is used to have a fast name and index access diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx index 45c9920571f9..f5b8554fade6 100644 --- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VColumn.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:19 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,8 +71,8 @@ #ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include <com/sun/star/container/XNamed.hpp> #endif -#ifndef _UNOTOOLS_PROPERTY_ARRAY_HELPER_HXX_ -#include <unotools/proparrhlp.hxx> +#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#include <comphelper/proparrhlp.hxx> #endif #ifndef _CPPUHELPER_COMPBASE3_HXX_ #include <cppuhelper/compbase3.hxx> @@ -98,7 +98,7 @@ namespace connectivity class OColumn : public OBaseMutex, public OColumn_BASE, - public ::utl::OPropertyArrayUsageHelper<OColumn>, + public ::comphelper::OPropertyArrayUsageHelper<OColumn>, public ODescriptor { diff --git a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx index 218485309a97..46df53666595 100644 --- a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx +++ b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VDescriptor.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: fs $ $Date: 2000-10-05 08:56:00 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,7 +86,7 @@ namespace connectivity ::rtl::OUString m_Name; private: sal_Bool m_bNew; - utl::UStringMixEqual m_aCase; + comphelper::UStringMixEqual m_aCase; public: ODescriptor(::cppu::OBroadcastHelper& _rBHelper,sal_Bool _bCase, sal_Bool _bNew = sal_False) diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/connectivity/sdbcx/VGroup.hxx index 5962288cc179..36e968345b76 100644 --- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx +++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VGroup.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: fs $ $Date: 2000-10-05 08:56:00 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,8 +76,8 @@ #ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include <com/sun/star/container/XNamed.hpp> #endif -#ifndef _UNOTOOLS_PROPERTY_ARRAY_HELPER_HXX_ -#include <unotools/proparrhlp.hxx> +#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#include <comphelper/proparrhlp.hxx> #endif #ifndef _CPPUHELPER_COMPBASE4_HXX_ #include <cppuhelper/compbase4.hxx> @@ -115,7 +115,7 @@ namespace connectivity class OGroup : public OBaseMutex, public OGroup_BASE, public IRefreshableUsers, - public ::utl::OPropertyArrayUsageHelper<OGroup>, + public ::comphelper::OPropertyArrayUsageHelper<OGroup>, public ODescriptor { protected: diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx index 28c6c5b68bd5..a46103319043 100644 --- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx +++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VIndex.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:19 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,8 +75,8 @@ #ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include <com/sun/star/container/XNamed.hpp> #endif -#ifndef _UNOTOOLS_PROPERTY_ARRAY_HELPER_HXX_ -#include <unotools/proparrhlp.hxx> +#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#include <comphelper/proparrhlp.hxx> #endif #ifndef _CPPUHELPER_COMPBASE2_HXX_ #include <cppuhelper/compbase2.hxx> @@ -108,7 +108,7 @@ namespace connectivity class OIndex : public OBaseMutex, public OColumns_BASE, public IRefreshableColumns, - public ::utl::OPropertyArrayUsageHelper<OIndex>, + public ::comphelper::OPropertyArrayUsageHelper<OIndex>, public ODescriptor { protected: diff --git a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx index 041bbd3f3fa5..0a893d8dd5e1 100644 --- a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VIndexColumn.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:19 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,7 +71,7 @@ namespace connectivity namespace sdbcx { class OIndexColumn; - typedef ::utl::OPropertyArrayUsageHelper<OIndexColumn> OIndexColumn_PROP; + typedef ::comphelper::OPropertyArrayUsageHelper<OIndexColumn> OIndexColumn_PROP; class OIndexColumn : public OColumn, public OIndexColumn_PROP diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx index c8c3ce7e745c..25741b6dfc78 100644 --- a/connectivity/inc/connectivity/sdbcx/VKey.hxx +++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VKey.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:19 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,8 +66,8 @@ #include <osl/diagnose.h> #endif -#ifndef _UNOTOOLS_PROPERTY_ARRAY_HELPER_HXX_ -#include <unotools/proparrhlp.hxx> +#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#include <comphelper/proparrhlp.hxx> #endif #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include "connectivity/CommonTools.hxx" @@ -96,7 +96,7 @@ namespace connectivity class OKey : public OBaseMutex, public OColumns_BASE, public IRefreshableColumns, - public ::utl::OPropertyArrayUsageHelper<OKey>, + public ::comphelper::OPropertyArrayUsageHelper<OKey>, public ODescriptor { protected: diff --git a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx index 36371c278073..4a45398ddad4 100644 --- a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VKeyColumn.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:19 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,7 +71,7 @@ namespace connectivity namespace sdbcx { class OKeyColumn; - typedef ::utl::OPropertyArrayUsageHelper<OKeyColumn> OKeyColumn_PROP; + typedef ::comphelper::OPropertyArrayUsageHelper<OKeyColumn> OKeyColumn_PROP; class OKeyColumn : public OColumn, public OKeyColumn_PROP diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/connectivity/inc/connectivity/sdbcx/VTable.hxx index 68f611070dd2..350b61fdc6cc 100644 --- a/connectivity/inc/connectivity/sdbcx/VTable.hxx +++ b/connectivity/inc/connectivity/sdbcx/VTable.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VTable.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:19 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,8 +84,8 @@ #ifndef _COM_SUN_STAR_SDBCX_XALTERTABLE_HPP_ #include <com/sun/star/sdbcx/XAlterTable.hpp> #endif -#ifndef _UNOTOOLS_PROPERTY_ARRAY_HELPER_HXX_ -#include <unotools/proparrhlp.hxx> +#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#include <comphelper/proparrhlp.hxx> #endif #ifndef _CPPUHELPER_COMPBASE8_HXX_ #include <cppuhelper/compbase8.hxx> @@ -124,7 +124,7 @@ namespace connectivity class OTable : public OBaseMutex, public OTable_BASE, public IRefreshableColumns, - public ::utl::OPropertyArrayUsageHelper<OTable>, + public ::comphelper::OPropertyArrayUsageHelper<OTable>, public ODescriptor { protected: diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/connectivity/inc/connectivity/sdbcx/VUser.hxx index d7cb74e851c9..2a33df59f864 100644 --- a/connectivity/inc/connectivity/sdbcx/VUser.hxx +++ b/connectivity/inc/connectivity/sdbcx/VUser.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VUser.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:19 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,8 +72,8 @@ #ifndef _COM_SUN_STAR_SDBCX_XGROUPSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XGroupsSupplier.hpp> #endif -#ifndef _UNOTOOLS_PROPERTY_ARRAY_HELPER_HXX_ -#include <unotools/proparrhlp.hxx> +#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#include <comphelper/proparrhlp.hxx> #endif #ifndef _CPPUHELPER_COMPBASE4_HXX_ #include <cppuhelper/compbase4.hxx> @@ -109,7 +109,7 @@ namespace connectivity class OUser : public OBaseMutex, public OUser_BASE, public IRefreshableGroups, - public ::utl::OPropertyArrayUsageHelper<OUser>, + public ::comphelper::OPropertyArrayUsageHelper<OUser>, public ODescriptor { protected: diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/connectivity/inc/connectivity/sdbcx/VView.hxx index 91f83624f9fd..fa2de1d5e88d 100644 --- a/connectivity/inc/connectivity/sdbcx/VView.hxx +++ b/connectivity/inc/connectivity/sdbcx/VView.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VView.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:19 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,8 +69,8 @@ #ifndef _COM_SUN_STAR_SDBCX_XDATADESCRIPTORFACTORY_HPP_ #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #endif -#ifndef _UNOTOOLS_PROPERTY_ARRAY_HELPER_HXX_ -#include <unotools/proparrhlp.hxx> +#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#include <comphelper/proparrhlp.hxx> #endif #ifndef _CPPUHELPER_COMPBASE1_HXX_ #include <cppuhelper/compbase1.hxx> @@ -110,7 +110,7 @@ namespace connectivity public OView_BASE, public ::com::sun::star::container::XNamed, public ::com::sun::star::lang::XServiceInfo, - public ::utl::OPropertyArrayUsageHelper<OView>, + public ::comphelper::OPropertyArrayUsageHelper<OView>, public ODescriptor { protected: diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx index c8176e6c950e..8801d33e911d 100644 --- a/connectivity/inc/connectivity/sqliterator.hxx +++ b/connectivity/inc/connectivity/sqliterator.hxx @@ -2,9 +2,9 @@ * * $RCSfile: sqliterator.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:18 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:48:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -144,7 +144,7 @@ namespace connectivity OSQLStatementType m_eStatementType; // Art des Statements OSQLTables m_aTables; // Alle Tabellen die im ParseTree und bei der Connection gefunden wurden ::vos::ORef<OSQLColumns> m_aSelectColumns; // alle Spalten aus dem Select-Clause - ::utl::UStringMixEqual m_aCaseEqual; + ::comphelper::UStringMixEqual m_aCaseEqual; Link m_aErrorHdl; // wird im Fehlerfall gerufen ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xTables; diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index 9142ac4af8ec..5b08052c20eb 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.cxx @@ -2,9 +2,9 @@ * * $RCSfile: CommonTools.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:19 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:43:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -288,7 +288,7 @@ namespace connectivity OSQLColumns::const_iterator find( OSQLColumns::const_iterator __first, OSQLColumns::const_iterator __last, const ::rtl::OUString& _rVal, - const ::utl::UStringMixEqual& _rCase) + const ::comphelper::UStringMixEqual& _rCase) { while (__first != __last && !_rCase(getString((*__first)->getFastPropertyValue(PROPERTY_ID_NAME)),_rVal)) ++__first; @@ -298,7 +298,7 @@ namespace connectivity OSQLColumns::const_iterator findRealName( OSQLColumns::const_iterator __first, OSQLColumns::const_iterator __last, const ::rtl::OUString& _rVal, - const ::utl::UStringMixEqual& _rCase) + const ::comphelper::UStringMixEqual& _rCase) { while (__first != __last && !_rCase(getString((*__first)->getFastPropertyValue(PROPERTY_ID_REALNAME)),_rVal)) ++__first; @@ -309,7 +309,7 @@ namespace connectivity OSQLColumns::const_iterator __last, const ::rtl::OUString& _rProp, const ::rtl::OUString& _rVal, - const ::utl::UStringMixEqual& _rCase) + const ::comphelper::UStringMixEqual& _rCase) { while (__first != __last && !_rCase(getString(Reference<XPropertySet>((*__first),UNO_QUERY)->getPropertyValue(_rProp)),_rVal)) ++__first; diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index 295029ab8a1f..a10d597bd523 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ADatabaseMetaDataResultSet.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:20 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:45:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,8 +81,8 @@ #ifndef _COM_SUN_STAR_SDBC_INDEXTYPE_HPP_ #include <com/sun/star/sdbc/IndexType.hpp> #endif -#ifndef _UTL_PROPERTY_HXX_ -#include <unotools/property.hxx> +#ifndef _COMPHELPER_PROPERTY_HXX_ +#include <comphelper/property.hxx> #endif #ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> @@ -99,8 +99,8 @@ #ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include <cppuhelper/typeprovider.hxx> #endif -#ifndef _UTL_SEQUENCE_HXX_ -#include <unotools/sequence.hxx> +#ifndef _COMPHELPER_SEQUENCE_HXX_ +#include <comphelper/sequence.hxx> #endif #include <oledb.h> @@ -170,7 +170,7 @@ Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) th ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 )); - return ::utl::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes()); } // ------------------------------------------------------------------------- @@ -842,9 +842,9 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( throw ::com::sun::star::lang::IllegalArgumentException(); break; case PROPERTY_ID_FETCHDIRECTION: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchDirection()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchDirection()); case PROPERTY_ID_FETCHSIZE: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchSize()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchSize()); default: ; } diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 676b910567f8..176649ca57f9 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AStatement.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: oj $ $Date: 2000-10-09 11:26:03 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:45:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,8 +73,8 @@ #ifndef _COMPHELPER_PROPERTY_HXX_ #include <comphelper/property.hxx> #endif -#ifndef _UTL_UNO3_HXX_ -#include <unotools/uno3.hxx> +#ifndef _COMPHELPER_UNO3_HXX_ +#include <comphelper/uno3.hxx> #endif #ifndef _OSL_THREAD_H_ #include <osl/thread.h> @@ -252,7 +252,7 @@ void OStatement_Base::clearMyResultSet () throw (SQLException) throw DisposedException(); Reference<XCloseable> xCloseable; - if(::utl::query_interface(m_xResultSet.get(),xCloseable)) + if(::comphelper::query_interface(m_xResultSet.get(),xCloseable)) xCloseable->close(); m_xResultSet = Reference< XResultSet>(); } diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx index d375e517f602..cd8d758da917 100644 --- a/connectivity/source/drivers/dbase/DColumns.cxx +++ b/connectivity/source/drivers/dbase/DColumns.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DColumns.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:21 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:45:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,7 +86,7 @@ Reference< XNamed > ODbaseColumns::createObject(const ::rtl::OUString& _rName) // Reference< XFastPropertySet> xCol(pTable->getColumns()[_rName],UNO_QUERY); ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns(); - Reference< XNamed > xRet(*find(aCols->begin(),aCols->end(),_rName,::utl::UStringMixEqual(isCaseSensitive())),UNO_QUERY); + Reference< XNamed > xRet(*find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())),UNO_QUERY); return xRet; } diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx index 56d473a2ddff..15ba181f597b 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.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:21 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:45:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,7 +85,7 @@ Reference< XNamed > ODbaseIndexColumns::createObject(const ::rtl::OUString& _rNa ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns(); - Reference< XFastPropertySet > xCol(*find(aCols->begin(),aCols->end(),_rName,::utl::UStringMixEqual(isCaseSensitive()))); + Reference< XFastPropertySet > xCol(*find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive()))); if(!xCol.is()) return Reference< XNamed >(); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index ee196b4a0987..1fefc2b1d46c 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DTable.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: oj $ $Date: 2000-10-09 12:31:04 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:45:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1377,7 +1377,7 @@ BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols) Reference<XFastPropertySet> xCol; ::rtl::OUString aColName; - ::utl::UStringMixEqual aCase(isCaseSensitive()); + ::comphelper::UStringMixEqual aCase(isCaseSensitive()); for (USHORT i = 0; i < m_pColumns->getCount(); i++) { m_pColumns->getByIndex(i) >>= xCol; @@ -1627,7 +1627,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueVector& rRow, OValueRow pOrgRow,const Refer ::rtl::OUString aColName; ::std::vector< Reference<XFastPropertySet> > aIndexedCols(m_pColumns->getCount()); - ::utl::UStringMixEqual aCase(isCaseSensitive()); + ::comphelper::UStringMixEqual aCase(isCaseSensitive()); // first search a key that exist already in the table for (i = 0; i < m_pColumns->getCount(); i++) @@ -1857,4 +1857,4 @@ BOOL ODbaseTable::WriteBuffer() long nPos = m_aHeader.db_kopf + (long)(m_nFilePos-1) * m_aHeader.db_slng; m_aFileStream.Seek(nPos); return m_aFileStream.Write((char*) m_pBuffer, m_aHeader.db_slng) > 0; -}
\ No newline at end of file +} diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 4ca0b55bc1c8..428464e00947 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -2,9 +2,9 @@ * * $RCSfile: FResultSet.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: oj $ $Date: 2000-10-10 06:06:55 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:47:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1808,7 +1808,7 @@ BOOL OResultSet::OpenImpl() // now check which columns are bound OValueVector::iterator aRowIter = m_aRow->begin(); - ::utl::UStringMixEqual aCase(m_xDBMetaData->storesMixedCaseQuotedIdentifiers()); + ::comphelper::UStringMixEqual aCase(m_xDBMetaData->storesMixedCaseQuotedIdentifiers()); sal_Int32 i=0; Reference<XFastPropertySet> xProp; ++aRowIter; @@ -2431,7 +2431,7 @@ void OResultSet::ParseAssignValues(const ::std::vector< String>& aColumnNameList sal_Int32 nParameter = -1; if(m_xParamColumns.isValid()) { - OSQLColumns::const_iterator aIter = find(m_xParamColumns->begin(),m_xParamColumns->end(),aColumnName,::utl::UStringMixEqual(m_pTable->isCaseSensitive())); + OSQLColumns::const_iterator aIter = find(m_xParamColumns->begin(),m_xParamColumns->end(),aColumnName,::comphelper::UStringMixEqual(m_pTable->isCaseSensitive())); if(aIter != m_xParamColumns->end()) nParameter = m_xParamColumns->size() - (m_xParamColumns->end() - aIter) +1;// +1 because the rows start at 1 } diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 43507b9dd22d..fee7ce3b784d 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -2,9 +2,9 @@ * * $RCSfile: FStatement.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: oj $ $Date: 2000-10-09 12:34:19 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:47:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,8 +77,8 @@ #ifndef _COMPHELPER_PROPERTY_HXX_ #include <comphelper/property.hxx> #endif -#ifndef _UTL_UNO3_HXX_ -#include <unotools/uno3.hxx> +#ifndef _COMPHELPER_UNO3_HXX_ +#include <comphelper/uno3.hxx> #endif #ifndef _OSL_THREAD_H_ #include <osl/thread.h> @@ -220,7 +220,7 @@ void OStatement_Base::clearMyResultSet () throw (SQLException) throw DisposedException(); Reference<XCloseable> xCloseable; - if(::utl::query_interface(m_xResultSet.get(),xCloseable)) + if(::comphelper::query_interface(m_xResultSet.get(),xCloseable)) xCloseable->close(); m_xResultSet = Reference< XResultSet>(); } diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx index 2847fc7fd58b..8cb163a7ad24 100644 --- a/connectivity/source/drivers/flat/EColumns.cxx +++ b/connectivity/source/drivers/flat/EColumns.cxx @@ -2,9 +2,9 @@ * * $RCSfile: EColumns.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: oj $ $Date: 2000-10-05 14:42:34 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:46:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,7 @@ Reference< XNamed > OFlatColumns::createObject(const ::rtl::OUString& _rName) OFlatTable* pTable = (OFlatTable*)m_pTable; ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns(); - Reference< XNamed > xRet(*find(aCols->begin(),aCols->end(),_rName,::utl::UStringMixEqual(isCaseSensitive())),UNO_QUERY); + Reference< XNamed > xRet(*find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())),UNO_QUERY); return xRet; } diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx index 1bed54aca1c3..2805f3573eb9 100644 --- a/connectivity/source/drivers/flat/EResultSet.cxx +++ b/connectivity/source/drivers/flat/EResultSet.cxx @@ -2,9 +2,9 @@ * * $RCSfile: EResultSet.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: oj $ $Date: 2000-10-05 14:43:33 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:46:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,8 +71,8 @@ #ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> #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" @@ -148,7 +148,7 @@ Sequence< Type > SAL_CALL OFlatResultSet::getTypes( ) throw( RuntimeException) } } - return ::utl::concatSequences(aRet,OFlatResultSet_BASE::getTypes()); + return ::comphelper::concatSequences(aRet,OFlatResultSet_BASE::getTypes()); } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 0de4740d7d1b..12ff1a7043fb 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ETable.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: oj $ $Date: 2000-10-05 14:44:02 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:46:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,8 +89,8 @@ #ifndef _CONFIG_HXX //autogen #include <vcl/config.hxx> #endif -#ifndef _UTL_SEQUENCE_HXX_ -#include <unotools/sequence.hxx> +#ifndef _COMPHELPER_SEQUENCE_HXX_ +#include <comphelper/sequence.hxx> #endif #ifndef _CONNECTIVITY_DATECONVERSION_HXX_ #include "connectivity/DateConversion.hxx" @@ -111,8 +111,8 @@ #ifndef _CPPUHELPER_EXTRACT_HXX_ #include <cppuhelper/extract.hxx> #endif -#ifndef _UTL_NUMBERS_HXX_ -#include <unotools/numbers.hxx> +#ifndef _COMPHELPER_NUMBERS_HXX_ +#include <comphelper/numbers.hxx> #endif #ifndef _CONNECTIVITY_FLAT_EDRIVER_HXX_ #include "flat/EDriver.hxx" @@ -134,7 +134,7 @@ using namespace connectivity; using namespace connectivity::flat; using namespace connectivity::file; using namespace ucb; -using namespace utl; +using namespace comphelper; using namespace cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; @@ -411,7 +411,7 @@ void OFlatTable::fillColumns() else { - switch (utl::getNumberFormatType(m_xNumberFormatter,nIndex)) + switch (comphelper::getNumberFormatType(m_xNumberFormatter,nIndex)) { case NUMBERFORMAT_DATE: eType = DataType::DATE; @@ -482,7 +482,7 @@ OFlatTable::OFlatTable(OFlatConnection* _pConnection, { Any aValue = ConfigManager::GetDirectConfigProperty(ConfigManager::LOCALE); - LanguageType eLanguage = ConvertIsoStringToLanguage(utl::getString(aValue),'_'); + LanguageType eLanguage = ConvertIsoStringToLanguage(comphelper::getString(aValue),'_'); String sLanguage, sCountry; ConvertLanguageToIsoNames(eLanguage, sLanguage, sCountry); ::com::sun::star::lang::Locale aAppLocale(sLanguage,sCountry,rtl::OUString()); diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index be6616d4b0ae..14aef7b63ae8 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -2,9 +2,9 @@ * * $RCSfile: CallableStatement.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:22 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:46:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,8 +82,8 @@ #ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include <cppuhelper/typeprovider.hxx> #endif -#ifndef _UTL_SEQUENCE_HXX_ -#include <unotools/sequence.hxx> +#ifndef _COMPHELPER_SEQUENCE_HXX_ +#include <comphelper/sequence.hxx> #endif using namespace connectivity; @@ -113,7 +113,7 @@ Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) th ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< starsdbc::XRow > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< starsdbc::XOutParameters > *)0 )); - return ::utl::concatSequences(aTypes.getTypes(),java_sql_PreparedStatement::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_PreparedStatement::getTypes()); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) throw(starsdbc::SQLException, RuntimeException) diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index ff93e7751a38..0d9fa9f09ac1 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DatabaseMetaData.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:22 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:46:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,9 +76,6 @@ #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include "connectivity/CommonTools.hxx" #endif -//#ifndef _UTL_TYPES_HXX_ -//#include <unotools/types.hxx> -//#endif using namespace connectivity; using namespace ::com::sun::star::uno; diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 4b7a5dd70e07..b234923df1ac 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PreparedStatement.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:22 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:46:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,8 +76,8 @@ #ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include <cppuhelper/typeprovider.hxx> #endif -#ifndef _UTL_SEQUENCE_HXX_ -#include <unotools/sequence.hxx> +#ifndef _COMPHELPER_SEQUENCE_HXX_ +#include <comphelper/sequence.hxx> #endif using namespace connectivity; @@ -138,7 +138,7 @@ void java_sql_PreparedStatement::saveClassRef( jclass pClass ) ::getCppuType( (const ::com::sun::star::uno::Reference< XParameters > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedBatchExecution > *)0 )); - return ::utl::concatSequences(aTypes.getTypes(),OStatement_BASE2::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE2::getTypes()); } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 94bd7aa197b4..b7c9bb886081 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ResultSet.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:22 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:46:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,8 +94,8 @@ #ifndef _CONNECTIVITY_PROPERTYIDS_HXX_ #include "propertyids.hxx" #endif -#ifndef _UTL_PROPERTY_HXX_ -#include <unotools/property.hxx> +#ifndef _COMPHELPER_PROPERTY_HXX_ +#include <comphelper/property.hxx> #endif #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include "connectivity/CommonTools.hxx" @@ -103,8 +103,8 @@ #ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include <cppuhelper/typeprovider.hxx> #endif -#ifndef _UTL_SEQUENCE_HXX_ -#include <unotools/sequence.hxx> +#ifndef _COMPHELPER_SEQUENCE_HXX_ +#include <comphelper/sequence.hxx> #endif #ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -184,7 +184,7 @@ void java_sql_ResultSet::disposing(void) ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 )); - return ::utl::concatSequences(aTypes.getTypes(),java_sql_ResultSet_BASE::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_ResultSet_BASE::getTypes()); } // ------------------------------------------------------------------------- @@ -1780,9 +1780,9 @@ sal_Bool java_sql_ResultSet::convertFastPropertyValue( throw ::com::sun::star::lang::IllegalArgumentException(); break; case PROPERTY_ID_FETCHDIRECTION: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchDirection()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchDirection()); case PROPERTY_ID_FETCHSIZE: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchSize()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchSize()); default: ; } diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index 40da2368fb93..e1d7c655c074 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -2,9 +2,9 @@ * * $RCSfile: OPreparedStatement.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:23 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:46:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,8 +82,8 @@ #ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include <cppuhelper/typeprovider.hxx> #endif -#ifndef _UTL_SEQUENCE_HXX_ -#include <unotools/sequence.hxx> +#ifndef _COMPHELPER_SEQUENCE_HXX_ +#include <comphelper/sequence.hxx> #endif #ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> @@ -134,7 +134,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt ::getCppuType( (const ::com::sun::star::uno::Reference< XResultSetMetaDataSupplier > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedBatchExecution > *)0 )); - return ::utl::concatSequences(aTypes.getTypes(),OStatement_BASE2::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE2::getTypes()); } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 346f2a32e3c4..c47f9e59ed69 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -2,9 +2,9 @@ * * $RCSfile: OResultSet.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: fs $ $Date: 2000-10-06 12:07:30 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:46:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,14 +79,14 @@ #ifndef _COM_SUN_STAR_SDBCX_COMPAREBOOKMARK_HPP_ #include <com/sun/star/sdbcx/CompareBookmark.hpp> #endif -#ifndef _UTL_PROPERTY_HXX_ -#include <unotools/property.hxx> +#ifndef _COMPHELPER_PROPERTY_HXX_ +#include <comphelper/property.hxx> #endif #ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> #endif -#ifndef _UTL_SEQUENCE_HXX_ -#include <unotools/sequence.hxx> +#ifndef _COMPHELPER_SEQUENCE_HXX_ +#include <comphelper/sequence.hxx> #endif #ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include <cppuhelper/typeprovider.hxx> @@ -337,7 +337,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 )); - return ::utl::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes()); } // ------------------------------------------------------------------------- @@ -1222,11 +1222,11 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th // } // break; // case TypeClass_DOUBLE: -// updateDouble(columnIndex,::utl::getDouble(x)); +// updateDouble(columnIndex,::comphelper::getDouble(x)); // break; // case TypeClass_CHAR: // case TypeClass_STRING: -// updateString(columnIndex,::utl::getString(x)); +// updateString(columnIndex,::comphelper::getString(x)); // break; // case TypeClass_ENUM: // default: @@ -1489,9 +1489,9 @@ sal_Bool OResultSet::convertFastPropertyValue( throw ::com::sun::star::lang::IllegalArgumentException(); break; case PROPERTY_ID_FETCHDIRECTION: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchDirection()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchDirection()); case PROPERTY_ID_FETCHSIZE: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchSize()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchSize()); default: ; } diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 3fa896cdfece..80adf531904c 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -2,9 +2,9 @@ * * $RCSfile: OStatement.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:23 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:46:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,14 +73,14 @@ #ifndef _CONNECTIVITY_PROPERTYIDS_HXX_ #include "propertyids.hxx" #endif -#ifndef _UTL_PROPERTY_HXX_ -#include <unotools/property.hxx> +#ifndef _COMPHELPER_PROPERTY_HXX_ +#include <comphelper/property.hxx> #endif #ifndef _CONNECTIVITY_OTOOLS_HXX_ #include "odbc/OTools.hxx" #endif -#ifndef _UTL_UNO3_HXX_ -#include <unotools/uno3.hxx> +#ifndef _COMPHELPER_UNO3_HXX_ +#include <comphelper/uno3.hxx> #endif #ifndef _OSL_THREAD_H_ #include <osl/thread.h> @@ -95,8 +95,8 @@ #ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> #endif -#ifndef _UTL_SEQUENCE_HXX_ -#include <unotools/sequence.hxx> +#ifndef _COMPHELPER_SEQUENCE_HXX_ +#include <comphelper/sequence.hxx> #endif #ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include <cppuhelper/typeprovider.hxx> @@ -186,7 +186,7 @@ Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException) ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 )); - return ::utl::concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes()); } // ------------------------------------------------------------------------- @@ -239,7 +239,7 @@ void OStatement_Base::clearMyResultSet () throw (SQLException) throw DisposedException(); Reference<XCloseable> xCloseable; - if(::utl::query_interface(m_xResultSet.get(),xCloseable)) + if(::comphelper::query_interface(m_xResultSet.get(),xCloseable)) xCloseable->close(); m_xResultSet = Reference< XResultSet>(); } @@ -896,26 +896,26 @@ sal_Bool OStatement_Base::convertFastPropertyValue( switch(nHandle) { case PROPERTY_ID_QUERYTIMEOUT: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, getQueryTimeOut()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getQueryTimeOut()); case PROPERTY_ID_MAXFIELDSIZE: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, getMaxFieldSize()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getMaxFieldSize()); case PROPERTY_ID_MAXROWS: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, getMaxRows()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getMaxRows()); case PROPERTY_ID_CURSORNAME: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, getCursorName()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getCursorName()); case PROPERTY_ID_RESULTSETCONCURRENCY: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, getResultSetConcurrency()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getResultSetConcurrency()); case PROPERTY_ID_RESULTSETTYPE: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, getResultSetType()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getResultSetType()); case PROPERTY_ID_FETCHDIRECTION: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchDirection()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchDirection()); case PROPERTY_ID_FETCHSIZE: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchSize()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchSize()); case PROPERTY_ID_ESCAPEPROCESSING: - // return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); + // return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); break; case PROPERTY_ID_USEBOOKMARKS: - return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, isUsingBookmarks()); + return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, isUsingBookmarks()); default: ; @@ -952,7 +952,7 @@ void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const A setFetchSize(connectivity::getINT32(rValue)); break; case PROPERTY_ID_ESCAPEPROCESSING: - // return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); + // return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); break; case PROPERTY_ID_USEBOOKMARKS: setUsingBookmarks(connectivity::getBOOL(rValue)); diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx index 62d5b8d6c583..5c209f375b94 100644 --- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx @@ -2,9 +2,9 @@ * * $RCSfile: DDatabaseMetaDataResultSet.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: fs $ $Date: 2000-10-05 08:22:00 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,8 +92,8 @@ #ifndef _CPPUHELPER_COMPBASE7_HXX_ #include <cppuhelper/compbase7.hxx> #endif -#ifndef _UNOTOOLS_PROPERTY_ARRAY_HELPER_HXX_ -#include <unotools/proparrhlp.hxx> +#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#include <comphelper/proparrhlp.hxx> #endif #ifndef _CONNECTIVITY_FILE_ASTATEMENT_HXX_ #include "file/FStatement.hxx" @@ -131,7 +131,7 @@ namespace connectivity class ODatabaseMetaDataResultSet : public OBaseMutex, public ODatabaseMetaDataResultSet_BASE, public ::comphelper::OPropertyContainer, - public ::utl::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> + public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> { diff --git a/connectivity/source/inc/dbase/DResultSet.hxx b/connectivity/source/inc/dbase/DResultSet.hxx index 294c430845cf..234b12becc9b 100644 --- a/connectivity/source/inc/dbase/DResultSet.hxx +++ b/connectivity/source/inc/dbase/DResultSet.hxx @@ -2,9 +2,9 @@ * * $RCSfile: DResultSet.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: oj $ $Date: 2000-10-05 14:37:28 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,7 +83,7 @@ namespace connectivity typedef ::cppu::ImplHelper2< ::com::sun::star::sdbcx::XRowLocate, ::com::sun::star::sdbcx::XDeleteRows> ODbaseResultSet_BASE; typedef file::OResultSet ODbaseResultSet_BASE2; - typedef ::utl::OPropertyArrayUsageHelper<ODbaseResultSet> ODbaseResultSet_BASE3; + typedef ::comphelper::OPropertyArrayUsageHelper<ODbaseResultSet> ODbaseResultSet_BASE3; class ODbaseResultSet : public ODbaseResultSet_BASE2, diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index 00b4016e27da..249da0569788 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -2,9 +2,9 @@ * * $RCSfile: DTable.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: oj $ $Date: 2000-09-29 15:02:09 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,7 @@ namespace connectivity class ODbaseConnection; typedef ::std::map< ::rtl::OUString, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed>, utl::UStringMixLess > OContainer; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed>, comphelper::UStringMixLess > OContainer; class ODbaseTable : public ODbaseTable_BASE { diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx index 996afc54e07f..384e5036ed70 100644 --- a/connectivity/source/inc/java/sql/ResultSet.hxx +++ b/connectivity/source/inc/java/sql/ResultSet.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ResultSet.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:26 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:42:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,8 +94,8 @@ #ifndef _CPPUHELPER_COMPBASE10_HXX_ #include <cppuhelper/compbase10.hxx> #endif -#ifndef _UNOTOOLS_PROPERTY_ARRAY_HELPER_HXX_ -#include <unotools/proparrhlp.hxx> +#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#include <comphelper/proparrhlp.hxx> #endif #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include "connectivity/CommonTools.hxx" @@ -128,7 +128,7 @@ namespace connectivity public java_sql_ResultSet_BASE, public java_lang_Object, public ::cppu::OPropertySetHelper, - public ::utl::OPropertyArrayUsageHelper<java_sql_ResultSet> + public ::comphelper::OPropertyArrayUsageHelper<java_sql_ResultSet> { ::com::sun::star::uno::WeakReferenceHelper m_aStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx index c65ee9f6745f..7466e0d60ae9 100644 --- a/connectivity/source/inc/java/tools.hxx +++ b/connectivity/source/inc/java/tools.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tools.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:26 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:42:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,12 +76,10 @@ #include "java/sql/SQLException.hxx" #endif -#ifndef _UTL_UNO3_HXX_ -#include <unotools/uno3.hxx> +#ifndef _COMPHELPER_UNO3_HXX_ +#include <comphelper/uno3.hxx> #endif -//FORWARD_DECLARE_INTERFACE(container,XNameAccess) -//FORWARD_DECLARE_INTERFACE(uno,Reference) #include <com/sun/star/container/XNameAccess.hpp> #ifndef _COM_SUN_STAR_UTIL_TIME_HPP_ #include <com/sun/star/util/Time.hpp> diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index faa3fe55eb3b..5738577c0373 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VCollection.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: oj $ $Date: 2000-10-09 12:06:36 $ + * last change: $Author: fs $ $Date: 2000-10-11 10:43:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -143,7 +143,7 @@ Sequence< ::rtl::OUString > SAL_CALL OCollection::getElementNames( ) throw(Runt sal_Int32 i=0; ::rtl::OUString* pStringArray = aNameList.getArray(); - // for( ::std::map< ::rtl::OUString, Object_BASE, ::utl::UStringLess> ::const_iterator aIter = m_aNameMap.begin(); aIter != m_aNameMap.end(); ++aIter) + // for( ::std::map< ::rtl::OUString, Object_BASE, ::comphelper::UStringLess> ::const_iterator aIter = m_aNameMap.begin(); aIter != m_aNameMap.end(); ++aIter) for(::std::vector< ObjectIter >::const_iterator aIter = m_aElements.begin(); aIter != m_aElements.end();++aIter) pStringArray[i++] = (*aIter)->first; @@ -153,7 +153,7 @@ Sequence< ::rtl::OUString > SAL_CALL OCollection::getElementNames( ) throw(Runt void SAL_CALL OCollection::refresh( ) throw(RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); - for( ::std::map< ::rtl::OUString, Object_BASE, ::utl::UStringLess>::iterator aIter = m_aNameMap.begin(); aIter != m_aNameMap.end(); ++aIter) + for( ::std::map< ::rtl::OUString, Object_BASE, ::comphelper::UStringLess>::iterator aIter = m_aNameMap.begin(); aIter != m_aNameMap.end(); ++aIter) { if((*aIter).second.is()) { |