summaryrefslogtreecommitdiff
path: root/cppu/source/uno
diff options
context:
space:
mode:
Diffstat (limited to 'cppu/source/uno')
-rw-r--r--cppu/source/uno/destr.hxx55
-rw-r--r--cppu/source/uno/sequence.cxx8
2 files changed, 42 insertions, 21 deletions
diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx
index 9cce1c692c5d..95f496e10c56 100644
--- a/cppu/source/uno/destr.hxx
+++ b/cppu/source/uno/destr.hxx
@@ -19,6 +19,10 @@
#ifndef INCLUDED_CPPU_SOURCE_UNO_DESTR_HXX
#define INCLUDED_CPPU_SOURCE_UNO_DESTR_HXX
+#include <sal/config.h>
+
+#include <cassert>
+
#include "prim.hxx"
@@ -255,38 +259,47 @@ inline sal_Int32 idestructElements(
}
}
-
-inline void idestructSequence(
+inline void idestroySequence(
uno_Sequence * pSeq,
typelib_TypeDescriptionReference * pType,
typelib_TypeDescription * pTypeDescr,
uno_ReleaseFunc release )
{
- if (osl_atomic_decrement( &pSeq->nRefCount ) == 0)
+ assert(pSeq != nullptr);
+ assert(pSeq->nRefCount == 0);
+ if (pSeq->nElements > 0)
{
- if (pSeq->nElements > 0)
+ if (pTypeDescr)
{
- if (pTypeDescr)
- {
- idestructElements(
- pSeq->elements,
- ((typelib_IndirectTypeDescription *) pTypeDescr)->pType, 0,
- pSeq->nElements, release );
- }
- else
- {
- TYPELIB_DANGER_GET( &pTypeDescr, pType );
- idestructElements(
- pSeq->elements,
- ((typelib_IndirectTypeDescription *) pTypeDescr)->pType, 0,
- pSeq->nElements, release );
- TYPELIB_DANGER_RELEASE( pTypeDescr );
- }
+ idestructElements(
+ pSeq->elements,
+ ((typelib_IndirectTypeDescription *) pTypeDescr)->pType, 0,
+ pSeq->nElements, release );
+ }
+ else
+ {
+ TYPELIB_DANGER_GET( &pTypeDescr, pType );
+ idestructElements(
+ pSeq->elements,
+ ((typelib_IndirectTypeDescription *) pTypeDescr)->pType, 0,
+ pSeq->nElements, release );
+ TYPELIB_DANGER_RELEASE( pTypeDescr );
}
- ::rtl_freeMemory( pSeq );
}
+ ::rtl_freeMemory( pSeq );
}
+inline void idestructSequence(
+ uno_Sequence * pSeq,
+ typelib_TypeDescriptionReference * pType,
+ typelib_TypeDescription * pTypeDescr,
+ uno_ReleaseFunc release )
+{
+ if (osl_atomic_decrement( &pSeq->nRefCount ) == 0)
+ {
+ idestroySequence(pSeq, pType, pTypeDescr, release);
+ }
+}
inline void _destructData(
void * pValue,
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index cbd4369fa385..9523a6859ff4 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -920,6 +920,14 @@ void SAL_CALL uno_type_sequence_assign(
}
}
+void uno_type_sequence_destroy(
+ uno_Sequence * sequence, typelib_TypeDescriptionReference * type,
+ uno_ReleaseFunc release)
+ SAL_THROW_EXTERN_C()
+{
+ idestroySequence(sequence, type, nullptr, release);
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */