diff options
Diffstat (limited to 'cppu/source/uno/assign.hxx')
| -rw-r--r-- | cppu/source/uno/assign.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx index 42375832ab09..c7aa7cb9cd12 100644 --- a/cppu/source/uno/assign.hxx +++ b/cppu/source/uno/assign.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -148,7 +148,7 @@ inline sal_Bool _assignArray( { ::rtl_uString_assign( (rtl_uString **)pDest + i, ((rtl_uString **)pSource)[i] ); - } + } bRet = sal_True; break; case typelib_TypeClass_TYPE: @@ -165,7 +165,7 @@ inline sal_Bool _assignArray( for (i=0; i < nTotalElements; i++) { _destructAny( (uno_Any *)pDest + i, release ); - _copyConstructAny( (uno_Any *)pDest + i, (uno_Any *)pSource + i, + _copyConstructAny( (uno_Any *)pDest + i, (uno_Any *)pSource + i, pElementTypeRef, pElementTypeDescr, acquire, 0 ); } bRet = sal_True; @@ -183,7 +183,7 @@ inline sal_Bool _assignArray( { bRet = _assignStruct( (sal_Char *)pDest + i * nElementSize, (sal_Char *)pSource + i * nElementSize, - (typelib_CompoundTypeDescription *)pElementTypeDescr, + (typelib_CompoundTypeDescription *)pElementTypeDescr, queryInterface, acquire, release ); if (! bRet) break; @@ -194,8 +194,8 @@ inline sal_Bool _assignArray( for (i=0; i < nTotalElements; i++) { _destructUnion( (sal_Char*)pDest + i * nElementSize, pElementTypeDescr, release ); - _copyConstructUnion( (sal_Char*)pDest + i * nElementSize, - (sal_Char*)pSource + i * nElementSize, + _copyConstructUnion( (sal_Char*)pDest + i * nElementSize, + (sal_Char*)pSource + i * nElementSize, pElementTypeDescr, acquire, 0 ); } bRet = sal_True; @@ -216,8 +216,8 @@ inline sal_Bool _assignArray( for (i=0; i < nTotalElements; i++) { _assignInterface( - (void **)((sal_Char*)pDest + i * nElementSize), - *(void **)((sal_Char*)pSource + i * nElementSize), + (void **)((sal_Char*)pDest + i * nElementSize), + *(void **)((sal_Char*)pSource + i * nElementSize), acquire, release ); } bRet = sal_True; @@ -241,7 +241,7 @@ inline sal_Bool _assignData( { if (pDest == pSource) return _type_equals( pDestType, pSourceType ); - + if (! pSource) { _destructData( pDest, pDestType, pDestTypeDescr, release ); @@ -256,7 +256,7 @@ inline sal_Bool _assignData( if (pDest == pSource) return sal_True; } - + switch (pDestType->eTypeClass) { case typelib_TypeClass_VOID: @@ -614,7 +614,7 @@ inline sal_Bool _assignData( return true; } } - + // query for interface: void * pQueried = _queryInterface( *static_cast<void **>(pSource), pDestType, queryInterface ); |