diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 12:14:04 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 12:14:04 +0000 |
| commit | 2febeaf8e249d1eae93462d432ce9605cae22704 (patch) | |
| tree | 9d80a2d1203f6c88f50303aac6feedbfa5d15fa6 | |
| parent | 28b35a7822f5dc7758229c546f988d3592657980 (diff) | |
INTEGRATION: CWS warnings01 (1.12.46); FILE MERGED
2005/10/28 13:58:18 sb 1.12.46.4: #i53898# Fixed previous modification.
2005/09/22 20:45:10 sb 1.12.46.3: RESYNC: (1.12-1.13); FILE MERGED
2005/08/31 13:43:21 sb 1.12.46.2: #i53898# Made code warning-free.
2005/08/29 14:03:53 sb 1.12.46.1: #i53898# Made code warning-free.
| -rw-r--r-- | cppu/source/uno/copy.hxx | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx index cc1da301c840..74bf2279cafe 100644 --- a/cppu/source/uno/copy.hxx +++ b/cppu/source/uno/copy.hxx @@ -4,9 +4,9 @@ * * $RCSfile: copy.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2005-09-08 08:51:21 $ + * last change: $Author: hr $ $Date: 2006-06-19 13:14:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -266,9 +266,6 @@ inline void _copyConstructAnyFromData( // enum is forced to 32bit long *(sal_Int32 *)&pDestAny->pReserved = *(sal_Int32 *)pSource; break; - case typelib_TypeClass_TYPEDEF: - OSL_ENSURE( 0, "### unexpected typedef!" ); - break; case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: if (pTypeDescr) @@ -354,6 +351,9 @@ inline void _copyConstructAnyFromData( _acquire( pDestAny->pReserved = *(void **)pSource, acquire ); } break; + default: + OSL_ASSERT(false); + break; } } //-------------------------------------------------------------------------------------------------- @@ -479,9 +479,6 @@ inline void _copyConstructAny( TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; - case typelib_TypeClass_TYPEDEF: - OSL_ENSURE( 0, "### unexpected typedef!" ); - break; case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: if (pTypeDescr) @@ -537,6 +534,9 @@ inline void _copyConstructAny( pDestAny->pData = &pDestAny->pReserved; pDestAny->pReserved = 0; // either cpp or c-uno interface break; + default: + OSL_ASSERT(false); + break; } } } @@ -651,17 +651,17 @@ inline uno_Sequence * icopyConstructSequence( char * pSourceElements = pSource->elements; for ( sal_Int32 nPos = nElements; nPos--; ) { - char * pDest = + char * pDest2 = pElements + (nPos * nElementSize); - char * pSource = + char * pSource2 = pSourceElements + (nPos * nElementSize); typelib_TypeDescriptionReference * pSetType = - _unionGetSetType( pSource, pElementTypeDescr ); + _unionGetSetType( pSource2, pElementTypeDescr ); ::uno_type_copyAndConvertData( - pDest + nValueOffset, pSource + nValueOffset, + pDest2 + nValueOffset, pSource2 + nValueOffset, pSetType, mapping ); - *(sal_Int64 *)pDest = *(sal_Int64 *)pSource; + *(sal_Int64 *)pDest2 = *(sal_Int64 *)pSource2; ::typelib_typedescriptionreference_release( pSetType ); } } @@ -803,9 +803,6 @@ inline void _copyConstructData( case typelib_TypeClass_ENUM: *(sal_Int32 *)pDest = *(sal_Int32 *)pSource; break; - case typelib_TypeClass_TYPEDEF: - OSL_ENSURE( 0, "### unexpected typedef!" ); - break; case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: if (pTypeDescr) @@ -887,6 +884,8 @@ inline void _copyConstructData( else _acquire( *(void **)pDest = *(void **)pSource, acquire ); break; + default: + break; } } |