diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-31 10:18:17 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-31 10:18:17 +0100 |
commit | a2c464868aca4bb38aa8afff635da56942b597ac (patch) | |
tree | f6eba943ea933e250d98b37986e0d86773bead09 /cppu/source/uno/destr.hxx | |
parent | Remove UNOIDL "array" and "union" vaporware remnants (diff) | |
download | core-a2c464868aca4bb38aa8afff635da56942b597ac.tar.gz core-a2c464868aca4bb38aa8afff635da56942b597ac.zip |
[API CHANGE] Remove UNOIDL "array" and "union" vaporware remnants from cppu
This leaves only aborting stubs (for SONAME stability) for
typelib_static_array_type_init
typelib_typedescription_newArray
typelib_typedescription_newUnion
and completely removes corresponding
typelib_ArrayTypeDescription
typelib_UnionTypeDescription
structs and C++ inline
getCppuArrayType*
functions. None of this should ever have been called by client code anyway, so
while technically an API change it should not matter for practical purposes.
Change-Id: I23769d104d545533bf578762b79994e269d78c22
Diffstat (limited to 'cppu/source/uno/destr.hxx')
-rw-r--r-- | cppu/source/uno/destr.hxx | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx index f3bc26ff3927..c02e7cf7a267 100644 --- a/cppu/source/uno/destr.hxx +++ b/cppu/source/uno/destr.hxx @@ -29,19 +29,6 @@ namespace cppu //#### destruction ################################################################################# //################################################################################################## -//-------------------------------------------------------------------------------------------------- -inline void _destructUnion( - void * pValue, - typelib_TypeDescription * pTypeDescr, - uno_ReleaseFunc release ) - SAL_THROW(()) -{ - typelib_TypeDescriptionReference * pType = _unionGetSetType( pValue, pTypeDescr ); - ::uno_type_destructData( - (char *)pValue + ((typelib_UnionTypeDescription *)pTypeDescr)->nValueOffset, - pType, release ); - ::typelib_typedescriptionreference_release( pType ); -} //================================================================================================== void destructStruct( void * pValue, @@ -71,29 +58,6 @@ inline void _destructStruct( } } -//-------------------------------------------------------------------------------------------------- -inline void _destructArray( - void * pValue, - typelib_ArrayTypeDescription * pTypeDescr, - uno_ReleaseFunc release ) - throw () -{ - typelib_TypeDescription * pElementType = NULL; - TYPELIB_DANGER_GET( &pElementType, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType ); - sal_Int32 nElementSize = pElementType->nSize; - TYPELIB_DANGER_RELEASE( pElementType ); - - sal_Int32 nTotalElements = pTypeDescr->nTotalElements; - for(sal_Int32 i=0; i < nTotalElements; i++) - { - ::uno_type_destructData( - (sal_Char *)pValue + i * nElementSize, - ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, release ); - } - - typelib_typedescriptionreference_release(((typelib_IndirectTypeDescription *)pTypeDescr)->pType); -} - //============================================================================== void destructSequence( uno_Sequence * pSequence, @@ -155,15 +119,6 @@ inline void _destructAny( ::rtl_freeMemory( pAny->pData ); break; } - case typelib_TypeClass_UNION: - { - typelib_TypeDescription * pTypeDescr = 0; - TYPELIB_DANGER_GET( &pTypeDescr, pType ); - _destructUnion( pAny->pData, pTypeDescr, release ); - TYPELIB_DANGER_RELEASE( pTypeDescr ); - ::rtl_freeMemory( pAny->pData ); - break; - } case typelib_TypeClass_SEQUENCE: { destructSequence( @@ -257,22 +212,6 @@ inline sal_Int32 idestructElements( TYPELIB_DANGER_RELEASE( pElementTypeDescr ); return nSize; } - case typelib_TypeClass_UNION: - { - typelib_TypeDescription * pElementTypeDescr = 0; - TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType ); - sal_Int32 nElementSize = pElementTypeDescr->nSize; - for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) - { - _destructUnion( - (char *)pElements + (nElementSize * nPos), - pElementTypeDescr, - release ); - } - sal_Int32 nSize = pElementTypeDescr->nSize; - TYPELIB_DANGER_RELEASE( pElementTypeDescr ); - return nSize; - } case typelib_TypeClass_SEQUENCE: { typelib_TypeDescription * pElementTypeDescr = 0; @@ -387,30 +326,6 @@ inline void _destructData( TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; - case typelib_TypeClass_ARRAY: - if (pTypeDescr) - { - _destructArray( pValue, (typelib_ArrayTypeDescription *)pTypeDescr, release ); - } - else - { - TYPELIB_DANGER_GET( &pTypeDescr, pType ); - _destructArray( pValue, (typelib_ArrayTypeDescription *)pTypeDescr, release ); - TYPELIB_DANGER_RELEASE( pTypeDescr ); - } - break; - case typelib_TypeClass_UNION: - if (pTypeDescr) - { - _destructUnion( pValue, pTypeDescr, release ); - } - else - { - TYPELIB_DANGER_GET( &pTypeDescr, pType ); - _destructUnion( pValue, pTypeDescr, release ); - TYPELIB_DANGER_RELEASE( pTypeDescr ); - } - break; case typelib_TypeClass_SEQUENCE: { idestructSequence( |