diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 18:06:32 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 18:06:32 +0000 |
| commit | 5f2d3e0d353c1f1c7f4e4736058ac1d4fc99f860 (patch) | |
| tree | 0e910b949452a4be26ea152d58a3874bafe44f5b /cppu | |
| parent | f9f796571a8fc8dea67bf16b1a9d8ef763b9aba4 (diff) | |
INTEGRATION: CWS vclcleanup02 (1.16.14); FILE MERGED
2003/12/04 16:15:53 mt 1.16.14.1: #i23061# Fixed gcc WAll warnings
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/inc/com/sun/star/uno/Sequence.hxx | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx b/cppu/inc/com/sun/star/uno/Sequence.hxx index e2afe5cae..47ac806e4 100644 --- a/cppu/inc/com/sun/star/uno/Sequence.hxx +++ b/cppu/inc/com/sun/star/uno/Sequence.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Sequence.hxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: obo $ $Date: 2003-09-04 10:51:45 $ + * last change: $Author: vg $ $Date: 2004-01-06 19:06:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -126,7 +126,10 @@ template< class E > inline Sequence< E >::Sequence( const E * pElements, sal_Int32 len ) { const Type & rType = ::getCppuType( this ); - sal_Bool success = ::uno_type_sequence_construct( +#if ! defined EXCEPTIONS_OFF + sal_Bool success = +#endif + ::uno_type_sequence_construct( &_pSequence, rType.getTypeLibType(), const_cast< E * >( pElements ), len, (uno_AcquireFunc)cpp_acquire ); #if ! defined EXCEPTIONS_OFF @@ -140,7 +143,10 @@ template< class E > inline Sequence< E >::Sequence( sal_Int32 len ) { const Type & rType = ::getCppuType( this ); - sal_Bool success = ::uno_type_sequence_construct( +#if ! defined EXCEPTIONS_OFF + sal_Bool success = +#endif + ::uno_type_sequence_construct( &_pSequence, rType.getTypeLibType(), 0, len, (uno_AcquireFunc)cpp_acquire ); #if ! defined EXCEPTIONS_OFF @@ -196,7 +202,10 @@ template< class E > inline E * Sequence< E >::getArray() { const Type & rType = ::getCppuType( this ); - sal_Bool success = ::uno_type_sequence_reference2One( +#if ! defined EXCEPTIONS_OFF + sal_Bool success = +#endif + ::uno_type_sequence_reference2One( &_pSequence, rType.getTypeLibType(), (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); #if ! defined EXCEPTIONS_OFF @@ -232,11 +241,14 @@ template< class E > inline void Sequence< E >::realloc( sal_Int32 nSize ) { const Type & rType = ::getCppuType( this ); - sal_Bool success = ::uno_type_sequence_realloc( +#if !defined EXCEPTIONS_OFF + sal_Bool success = +#endif + ::uno_type_sequence_realloc( &_pSequence, rType.getTypeLibType(), nSize, (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); -#if ! defined EXCEPTIONS_OFF - if (! success) +#if !defined EXCEPTIONS_OFF + if (!success) throw ::std::bad_alloc(); #endif } |