diff options
| author | Oliver Bolte <obo@openoffice.org> | 2003-09-04 09:52:45 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2003-09-04 09:52:45 +0000 |
| commit | 5d4586c02b4c75b44865d53c0b304114670dedef (patch) | |
| tree | 890d4a092370219dc508fcf8ef7717938f49344f /cppu | |
| parent | da419ba1802295edd5074921604d5c216b5c1578 (diff) | |
INTEGRATION: CWS cliuno01 (1.13.2); FILE MERGED
2003/07/24 15:19:03 dbo 1.13.2.1: - sequence reallocation fix
- more code cleanup
- test code
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/source/uno/assign.hxx | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx index eac6418054f1..2387328ed47b 100644 --- a/cppu/source/uno/assign.hxx +++ b/cppu/source/uno/assign.hxx @@ -2,9 +2,9 @@ * * $RCSfile: assign.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: vg $ $Date: 2003-03-20 12:28:27 $ + * last change: $Author: obo $ $Date: 2003-09-04 10:52:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -241,9 +241,11 @@ inline sal_Bool _assignArray( case typelib_TypeClass_SEQUENCE: for (i=0; i < nTotalElements; i++) { - _destructSequence( - *((uno_Sequence **)pDest + i), pElementTypeRef, pElementTypeDescr, release ); - ::osl_incrementInterlockedCount( &(*((uno_Sequence **)pSource + i))->nRefCount ); + ::osl_incrementInterlockedCount( + &(*((uno_Sequence **)pSource + i))->nRefCount ); + idestructSequence( + *((uno_Sequence **)pDest + i), + pElementTypeRef, pElementTypeDescr, release ); *((uno_Sequence **)pDest + i) = *((uno_Sequence **)pSource + i); } bRet = sal_True; @@ -251,9 +253,10 @@ inline sal_Bool _assignArray( case typelib_TypeClass_INTERFACE: for (i=0; i < nTotalElements; i++) { - _assignInterface( (void **)((sal_Char*)pDest + i * nElementSize), - *(void **)((sal_Char*)pSource + i * nElementSize), - acquire, release ); + _assignInterface( + (void **)((sal_Char*)pDest + i * nElementSize), + *(void **)((sal_Char*)pSource + i * nElementSize), + acquire, release ); } bRet = sal_True; break; @@ -596,12 +599,15 @@ inline sal_Bool _assignData( case typelib_TypeClass_SEQUENCE: if (typelib_TypeClass_SEQUENCE != pSourceType->eTypeClass) return sal_False; - if (*(uno_Sequence **)pSource == *(uno_Sequence **)pDest) // self assignment + // self assignment: + if (*(uno_Sequence **)pSource == *(uno_Sequence **)pDest) return sal_True; if (_type_equals( pDestType, pSourceType )) { - _destructSequence( *(uno_Sequence **)pDest, pDestType, pDestTypeDescr, release ); - ::osl_incrementInterlockedCount( &(*(uno_Sequence **)pSource)->nRefCount ); + ::osl_incrementInterlockedCount( + &(*(uno_Sequence **)pSource)->nRefCount ); + idestructSequence( + *(uno_Sequence **)pDest, pDestType, pDestTypeDescr, release ); *(uno_Sequence **)pDest = *(uno_Sequence **)pSource; return sal_True; } |