summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Boelzle <dbo@openoffice.org>2001-09-06 09:25:51 +0000
committerDaniel Boelzle <dbo@openoffice.org>2001-09-06 09:25:51 +0000
commit477575245c0d92b86c1b435a88b6f4487fca91f8 (patch)
treef202086632de66176ff433f8189bef0039616d71
parenta4577572c54090b57fc2e7f8f4bd82d38d946912 (diff)
#91945# added uno_any_clear()
-rw-r--r--cppu/inc/uno/any2.h14
-rw-r--r--cppu/source/uno/any.cxx15
-rwxr-xr-xcppu/util/cppu.map1
3 files changed, 24 insertions, 6 deletions
diff --git a/cppu/inc/uno/any2.h b/cppu/inc/uno/any2.h
index 60420e55c..f20a02bdf 100644
--- a/cppu/inc/uno/any2.h
+++ b/cppu/inc/uno/any2.h
@@ -2,9 +2,9 @@
*
* $RCSfile: any2.h,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: dbo $ $Date: 2001-08-21 09:17:07 $
+ * last change: $Author: dbo $ $Date: 2001-09-06 10:25:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -201,6 +201,16 @@ void SAL_CALL uno_any_destruct(
uno_Any * pValue, uno_ReleaseFunc release )
SAL_THROW_EXTERN_C();
+/** Sets value to void.
+
+ @param pValue pointer to any
+ @param release function called each time an interface needs to be released;
+ defaults (0) to uno
+*/
+void SAL_CALL uno_any_clear(
+ uno_Any * pValue, uno_ReleaseFunc release )
+ SAL_THROW_EXTERN_C();
+
#ifdef __cplusplus
}
#endif
diff --git a/cppu/source/uno/any.cxx b/cppu/source/uno/any.cxx
index b21331d81..31ebb3350 100644
--- a/cppu/source/uno/any.cxx
+++ b/cppu/source/uno/any.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: any.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: dbo $ $Date: 2001-03-28 10:46:10 $
+ * last change: $Author: dbo $ $Date: 2001-09-06 10:25:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,7 +81,7 @@ void SAL_CALL uno_type_any_assign(
}
else
{
- __CONSTRUCT_EMPTY_ANY( (uno_Any *)pDest );
+ __CONSTRUCT_EMPTY_ANY( pDest );
}
}
//##################################################################################################
@@ -114,7 +114,7 @@ void SAL_CALL uno_type_any_construct(
}
else
{
- __CONSTRUCT_EMPTY_ANY( (uno_Any *)pDest );
+ __CONSTRUCT_EMPTY_ANY( pDest );
}
}
//##################################################################################################
@@ -171,4 +171,11 @@ void SAL_CALL uno_any_destruct( uno_Any * pValue, uno_ReleaseFunc release )
{
__destructAny( pValue, release );
}
+//##################################################################################################
+void SAL_CALL uno_any_clear( uno_Any * pValue, uno_ReleaseFunc release )
+ SAL_THROW_EXTERN_C()
+{
+ __destructAny( pValue, release );
+ __CONSTRUCT_EMPTY_ANY( pValue );
+}
}
diff --git a/cppu/util/cppu.map b/cppu/util/cppu.map
index e6dd248ac..5e20ab3a4 100755
--- a/cppu/util/cppu.map
+++ b/cppu/util/cppu.map
@@ -55,6 +55,7 @@ UDK_3_0_0 {
uno_any_constructAndConvert;
uno_type_any_constructAndConvert;
uno_any_destruct;
+ uno_any_clear;
uno_sequence_assign;
uno_type_sequence_assign;