diff options
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/drivers/ado/AColumn.cxx | 10 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/AGroup.cxx | 10 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/AIndex.cxx | 10 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/AKey.cxx | 10 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/APreparedStatement.cxx | 10 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/AResultSet.cxx | 18 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/AStatement.cxx | 38 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/ATable.cxx | 10 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/AUser.cxx | 10 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/AView.cxx | 10 |
10 files changed, 68 insertions, 68 deletions
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index 7bb7d0c45d30..53e17de16610 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AColumn.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:20 $ + * last change: $Author: oj $ $Date: 2000-10-09 11:23:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,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 _CONNECTIVITY_PROPERTYIDS_HXX_ #include "propertyids.hxx" @@ -169,7 +169,7 @@ Any SAL_CALL OAdoColumn::queryInterface( const Type & rType ) throw(RuntimeExcep { ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > *)0 )); - return ::utl::concatSequences(aTypes.getTypes(),OColumn_ADO::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),OColumn_ADO::getTypes()); } //-------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index 971922addf62..3e60faa92ff0 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AGroup.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:20 $ + * last change: $Author: oj $ $Date: 2000-10-09 11:23:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,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 #ifdef DELETE #undef DELETE @@ -180,7 +180,7 @@ Any SAL_CALL OAdoGroup::queryInterface( const Type & rType ) throw(RuntimeExcept { ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > *)0 )); - return ::utl::concatSequences(aTypes.getTypes(),OGroup_ADO::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),OGroup_ADO::getTypes()); } //-------------------------------------------------------------------------- Sequence< sal_Int8 > OAdoGroup::getUnoTunnelImplementationId() diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index f5c60ea843b9..31af3d977194 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AIndex.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:20 $ + * last change: $Author: oj $ $Date: 2000-10-09 11:23:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,8 +71,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 _CONNECTIVITY_ADO_COLUMNS_HXX_ #include "ado/AColumns.hxx" @@ -182,7 +182,7 @@ Any SAL_CALL OAdoIndex::queryInterface( const Type & rType ) throw(RuntimeExcept { ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > *)0 )); - return ::utl::concatSequences(aTypes.getTypes(),OIndex_ADO::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),OIndex_ADO::getTypes()); } //-------------------------------------------------------------------------- Sequence< sal_Int8 > OAdoIndex::getUnoTunnelImplementationId() diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index 6a7f7a437cf7..54b30b44fcc5 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AKey.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:20 $ + * last change: $Author: oj $ $Date: 2000-10-09 11:23:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,8 +71,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_SDBC_KEYRULE_HPP_ #include <com/sun/star/sdbc/KeyRule.hpp> @@ -182,7 +182,7 @@ Any SAL_CALL OAdoKey::queryInterface( const Type & rType ) throw(RuntimeExceptio { ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > *)0 )); - return ::utl::concatSequences(aTypes.getTypes(),OKey_ADO::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),OKey_ADO::getTypes()); } //-------------------------------------------------------------------------- Sequence< sal_Int8 > OAdoKey::getUnoTunnelImplementationId() diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index 423bff42b47c..5d80b9daf272 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -2,9 +2,9 @@ * * $RCSfile: APreparedStatement.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:20 $ + * last change: $Author: oj $ $Date: 2000-10-09 11:23:39 $ * * 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 #define CHECK_RETURN(x) \ @@ -131,7 +131,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_Base::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_Base::getTypes()); } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index f85bed5f0207..db30cdc9d2c8 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AResultSet.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:21 $ + * last change: $Author: oj $ $Date: 2000-10-09 11:23:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,8 +78,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> @@ -96,8 +96,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> @@ -212,7 +212,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep ::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(),OResultSet_BASE::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes()); } // ------------------------------------------------------------------------- @@ -1206,9 +1206,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/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 784310f32652..676b910567f8 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.2 $ + * $Revision: 1.3 $ * - * last change: $Author: fs $ $Date: 2000-10-06 12:02:47 $ + * last change: $Author: oj $ $Date: 2000-10-09 11:26:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,8 +70,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 _UTL_UNO3_HXX_ #include <unotools/uno3.hxx> @@ -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_SDBC_RESULTSETCONCURRENCY_HPP_ #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> @@ -182,7 +182,7 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime ::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(),OStatement_BASE::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes()); } // ------------------------------------------------------------------------- @@ -735,25 +735,25 @@ 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); case PROPERTY_ID_USEBOOKMARKS: - // return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); + // return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); default: ; } @@ -789,9 +789,9 @@ 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); case PROPERTY_ID_USEBOOKMARKS: - // return ::utl::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); + // return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); default: ; } diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index 7d106cfa5323..3762b6652ba5 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ATable.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:21 $ + * last change: $Author: oj $ $Date: 2000-10-09 11:23:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,8 +98,8 @@ #ifndef _CONNECTIVITY_ADO_AWRAPADO_HXX_ #include "ado/Awrapado.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" @@ -278,7 +278,7 @@ Any SAL_CALL OAdoTable::queryInterface( const Type & rType ) throw(RuntimeExcept { ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > *)0 )); - return ::utl::concatSequences(aTypes.getTypes(),OTable_TYPEDEF::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),OTable_TYPEDEF::getTypes()); } //-------------------------------------------------------------------------- Sequence< sal_Int8 > OAdoTable::getUnoTunnelImplementationId() diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index c15770cca86c..314ef35519b6 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AUser.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:21 $ + * last change: $Author: oj $ $Date: 2000-10-09 11:23:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,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_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> @@ -171,7 +171,7 @@ Any SAL_CALL OAdoUser::queryInterface( const Type & rType ) throw(RuntimeExcepti { ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > *)0 )); - return ::utl::concatSequences(aTypes.getTypes(),OUser_TYPEDEF::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),OUser_TYPEDEF::getTypes()); } //-------------------------------------------------------------------------- Sequence< sal_Int8 > OAdoUser::getUnoTunnelImplementationId() diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx index 690eb3735e84..7f482b73ea68 100644 --- a/connectivity/source/drivers/ado/AView.cxx +++ b/connectivity/source/drivers/ado/AView.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AView.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:21 $ + * last change: $Author: oj $ $Date: 2000-10-09 11:23:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,8 +76,8 @@ #ifndef _CONNECTIVITY_ADO_AWRAPADO_HXX_ #include "ado/Awrapado.hxx" #endif -#ifndef _UTL_SEQUENCE_HXX_ -#include <unotools/sequence.hxx> +#ifndef _COMPHELPER_SEQUENCE_HXX_ +#include <comphelper/sequence.hxx> #endif // ------------------------------------------------------------------------- using namespace connectivity::ado; @@ -154,7 +154,7 @@ Any SAL_CALL OAdoView::queryInterface( const Type & rType ) throw(RuntimeExcepti { ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > *)0 )); - return ::utl::concatSequences(aTypes.getTypes(),OAdoView::getTypes()); + return ::comphelper::concatSequences(aTypes.getTypes(),OAdoView::getTypes()); } //-------------------------------------------------------------------------- Sequence< sal_Int8 > OAdoView::getUnoTunnelImplementationId() |