summaryrefslogtreecommitdiff
path: root/cppu/source/uno
diff options
context:
space:
mode:
authorDaniel Boelzle <dbo@openoffice.org>2000-12-21 13:39:29 +0000
committerDaniel Boelzle <dbo@openoffice.org>2000-12-21 13:39:29 +0000
commit61193f586ba392e6da6955800945ec9da6830991 (patch)
treeaafc6547d85683cd942b642987f5d9eb6187e744 /cppu/source/uno
parent8c3c9f8b9121f0be8d18e40b1e1548d207e1c47f (diff)
empty throw () clauses
Diffstat (limited to 'cppu/source/uno')
-rw-r--r--cppu/source/uno/any.cxx11
-rw-r--r--cppu/source/uno/assign.hxx11
-rw-r--r--cppu/source/uno/constr.hxx10
-rw-r--r--cppu/source/uno/copy.hxx16
-rw-r--r--cppu/source/uno/data.cxx24
-rw-r--r--cppu/source/uno/destr.hxx16
-rw-r--r--cppu/source/uno/eq.hxx16
-rw-r--r--cppu/source/uno/lbenv.cxx117
-rw-r--r--cppu/source/uno/lbmap.cxx102
-rw-r--r--cppu/source/uno/prim.hxx22
-rw-r--r--cppu/source/uno/sequence.cxx17
11 files changed, 247 insertions, 115 deletions
diff --git a/cppu/source/uno/any.cxx b/cppu/source/uno/any.cxx
index 46897298fa4f..5970075b5ca4 100644
--- a/cppu/source/uno/any.cxx
+++ b/cppu/source/uno/any.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: any.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: dbo $ $Date: 2000-12-08 12:19:45 $
+ * last change: $Author: dbo $ $Date: 2000-12-21 14:39:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -72,6 +72,7 @@ SAL_DLLEXPORT void SAL_CALL uno_type_any_assign(
uno_Any * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ throw ()
{
__destructAny( pDest, release );
if (pType)
@@ -88,6 +89,7 @@ SAL_DLLEXPORT void SAL_CALL uno_any_assign(
uno_Any * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ throw ()
{
__destructAny( pDest, release );
if (pTypeDescr)
@@ -104,6 +106,7 @@ SAL_DLLEXPORT void SAL_CALL uno_type_any_construct(
uno_Any * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
uno_AcquireFunc acquire )
+ throw ()
{
if (pType)
{
@@ -119,6 +122,7 @@ SAL_DLLEXPORT void SAL_CALL uno_any_construct(
uno_Any * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
uno_AcquireFunc acquire )
+ throw ()
{
if (pTypeDescr)
{
@@ -134,6 +138,7 @@ SAL_DLLEXPORT void SAL_CALL uno_type_any_constructAndConvert(
uno_Any * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
uno_Mapping * mapping )
+ throw ()
{
if (pType)
{
@@ -149,6 +154,7 @@ SAL_DLLEXPORT void SAL_CALL uno_any_constructAndConvert(
uno_Any * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
uno_Mapping * mapping )
+ throw ()
{
if (pTypeDescr)
{
@@ -161,6 +167,7 @@ SAL_DLLEXPORT void SAL_CALL uno_any_constructAndConvert(
}
//##################################################################################################
SAL_DLLEXPORT void SAL_CALL uno_any_destruct( uno_Any * pValue, uno_ReleaseFunc release )
+ throw ()
{
__destructAny( pValue, release );
}
diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx
index 4846e5488e22..ede72636d21b 100644
--- a/cppu/source/uno/assign.hxx
+++ b/cppu/source/uno/assign.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: assign.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: dbo $ $Date: 2000-09-25 14:47:41 $
+ * last change: $Author: dbo $ $Date: 2000-12-21 14:39:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -79,6 +79,7 @@ namespace cppu
inline void __assignInterface(
void ** ppDest, void * pSource,
uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ throw ()
{
void * pDest = *ppDest;
if (pSource)
@@ -102,6 +103,7 @@ inline sal_Bool __queryAndAssignInterface(
void ** ppDest, void * pSource,
typelib_TypeDescriptionReference * pDestType,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+ throw ()
{
void * pDest = *ppDest;
if (pSource)
@@ -159,12 +161,14 @@ inline sal_Bool __queryAndAssignInterface(
sal_Bool assignStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
- uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release );
+ uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ throw ();
//--------------------------------------------------------------------------------------------------
inline sal_Bool __assignStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ throw ()
{
if (pTypeDescr->pBaseTypeDescription)
{
@@ -199,6 +203,7 @@ inline sal_Bool __assignData(
void * pSource,
typelib_TypeDescriptionReference * pSourceType, typelib_TypeDescription * pSourceTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ throw ()
{
if (pDest == pSource)
return sal_True;
diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx
index 0391f167b135..c26f20c61b54 100644
--- a/cppu/source/uno/constr.hxx
+++ b/cppu/source/uno/constr.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: constr.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 15:25:52 $
+ * last change: $Author: dbo $ $Date: 2000-12-21 14:39:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -75,6 +75,7 @@ namespace cppu
inline void __defaultConstructUnion(
void * pMem,
typelib_TypeDescription * pTypeDescr )
+ throw ()
{
::uno_type_constructData(
(char *)pMem + ((typelib_UnionTypeDescription *)pTypeDescr)->nValueOffset,
@@ -84,11 +85,13 @@ inline void __defaultConstructUnion(
//==================================================================================================
void defaultConstructStruct(
void * pMem,
- typelib_CompoundTypeDescription * pCompType );
+ typelib_CompoundTypeDescription * pCompType )
+ throw ();
//--------------------------------------------------------------------------------------------------
inline void __defaultConstructStruct(
void * pMem,
typelib_CompoundTypeDescription * pTypeDescr )
+ throw ()
{
if (pTypeDescr->pBaseTypeDescription)
{
@@ -110,6 +113,7 @@ inline void __defaultConstructData(
void * pMem,
typelib_TypeDescriptionReference * pType,
typelib_TypeDescription * pTypeDescr )
+ throw ()
{
switch (pType->eTypeClass)
{
diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx
index 4147db4beb5c..171e41991870 100644
--- a/cppu/source/uno/copy.hxx
+++ b/cppu/source/uno/copy.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: copy.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 15:25:52 $
+ * last change: $Author: dbo $ $Date: 2000-12-21 14:39:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,12 +77,14 @@ namespace cppu
void copyConstructStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
- uno_AcquireFunc acquire, uno_Mapping * mapping );
+ uno_AcquireFunc acquire, uno_Mapping * mapping )
+ throw ();
//--------------------------------------------------------------------------------------------------
inline void __copyConstructStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
+ throw ()
{
if (pTypeDescr->pBaseTypeDescription)
{
@@ -119,6 +121,7 @@ inline void __copyConstructUnion(
void * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
+ throw ()
{
typelib_TypeDescriptionReference * pSetType = __unionGetSetType( pSource, pTypeDescr );
if (mapping)
@@ -142,12 +145,14 @@ inline void __copyConstructUnion(
void copyConstructSequence(
uno_Sequence ** ppDest, uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
- uno_AcquireFunc acquire, uno_Mapping * mapping );
+ uno_AcquireFunc acquire, uno_Mapping * mapping )
+ throw ();
//--------------------------------------------------------------------------------------------------
inline void __copyConstructAnyFromData(
uno_Any * pDestAny, void * pSource,
typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
+ throw ()
{
TYPE_ACQUIRE( pType );
pDestAny->pType = pType;
@@ -285,6 +290,7 @@ inline void __copyConstructAny(
uno_Any * pDestAny, void * pSource,
typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
+ throw ()
{
if (typelib_TypeClass_VOID == pType->eTypeClass)
{
@@ -431,6 +437,7 @@ inline void __copyConstructSequence(
uno_Sequence ** ppDest, uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
uno_AcquireFunc acquire, uno_Mapping * mapping )
+ throw ()
{
typelib_TypeClass eTypeClass = pElementType->eTypeClass;
if (!mapping ||
@@ -587,6 +594,7 @@ inline void __copyConstructData(
void * pDest, void * pSource,
typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
+ throw ()
{
switch (pType->eTypeClass)
{
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index a188354ee45a..4bcd4986763f 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: data.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 15:25:53 $
+ * last change: $Author: dbo $ $Date: 2000-12-21 14:39:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,6 +77,7 @@ namespace cppu
void defaultConstructStruct(
void * pMem,
typelib_CompoundTypeDescription * pCompType )
+ throw ()
{
__defaultConstructStruct( pMem, pCompType );
}
@@ -85,6 +86,7 @@ void copyConstructStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
+ throw ()
{
__copyConstructStruct( pDest, pSource, pTypeDescr, acquire, mapping );
}
@@ -93,6 +95,7 @@ void destructStruct(
void * pValue,
typelib_CompoundTypeDescription * pTypeDescr,
uno_ReleaseFunc release )
+ throw ()
{
__destructStruct( pValue, pTypeDescr, release );
}
@@ -101,6 +104,7 @@ sal_Bool equalStruct(
void * pDest, void *pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+ throw ()
{
return __equalStruct( pDest, pSource, pTypeDescr, queryInterface, release );
}
@@ -109,6 +113,7 @@ sal_Bool assignStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ throw ()
{
return __assignStruct( pDest, pSource, pTypeDescr, queryInterface, acquire, release );
}
@@ -117,6 +122,7 @@ void copyConstructSequence(
uno_Sequence ** ppDest, uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
uno_AcquireFunc acquire, uno_Mapping * mapping )
+ throw ()
{
__copyConstructSequence( ppDest, pSource, pElementType, acquire, mapping );
}
@@ -125,6 +131,7 @@ void destructSequence(
uno_Sequence ** ppSequence,
typelib_TypeDescriptionReference * pElementType,
uno_ReleaseFunc release )
+ throw ()
{
uno_Sequence * pSequence = *ppSequence;
OSL_ASSERT( pSequence );
@@ -142,6 +149,7 @@ sal_Bool equalSequence(
uno_Sequence * pDest, uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+ throw ()
{
return __equalSequence( pDest, pSource, pElementType, queryInterface, release );
}
@@ -151,12 +159,14 @@ extern "C"
//##################################################################################################
SAL_DLLEXPORT void SAL_CALL uno_type_constructData(
void * pMem, typelib_TypeDescriptionReference * pType )
+ throw ()
{
__defaultConstructData( pMem, pType, 0 );
}
//##################################################################################################
SAL_DLLEXPORT void SAL_CALL uno_constructData(
void * pMem, typelib_TypeDescription * pTypeDescr )
+ throw ()
{
__defaultConstructData( pMem, pTypeDescr->pWeakRef, pTypeDescr );
}
@@ -164,6 +174,7 @@ SAL_DLLEXPORT void SAL_CALL uno_constructData(
SAL_DLLEXPORT void SAL_CALL uno_type_destructData(
void * pValue, typelib_TypeDescriptionReference * pType,
uno_ReleaseFunc release )
+ throw ()
{
__destructData( pValue, pType, 0, release );
}
@@ -172,6 +183,7 @@ SAL_DLLEXPORT void SAL_CALL uno_destructData(
void * pValue,
typelib_TypeDescription * pTypeDescr,
uno_ReleaseFunc release )
+ throw ()
{
__destructData( pValue, pTypeDescr->pWeakRef, pTypeDescr, release );
}
@@ -180,6 +192,7 @@ SAL_DLLEXPORT void SAL_CALL uno_type_copyData(
void * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
uno_AcquireFunc acquire )
+ throw ()
{
__copyConstructData( pDest, pSource, pType, 0, acquire, 0 );
}
@@ -188,6 +201,7 @@ SAL_DLLEXPORT void SAL_CALL uno_copyData(
void * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
uno_AcquireFunc acquire )
+ throw ()
{
__copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, acquire, 0 );
}
@@ -196,6 +210,7 @@ SAL_DLLEXPORT void SAL_CALL uno_type_copyAndConvertData(
void * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
uno_Mapping * mapping )
+ throw ()
{
__copyConstructData( pDest, pSource, pType, 0, 0, mapping );
}
@@ -204,6 +219,7 @@ SAL_DLLEXPORT void SAL_CALL uno_copyAndConvertData(
void * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
uno_Mapping * mapping )
+ throw ()
{
__copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, 0, mapping );
}
@@ -212,6 +228,7 @@ SAL_DLLEXPORT sal_Bool SAL_CALL uno_type_equalData(
void * pVal1, typelib_TypeDescriptionReference * pVal1Type,
void * pVal2, typelib_TypeDescriptionReference * pVal2Type,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+ throw ()
{
return __equalData( pVal1, pVal1Type, 0,
pVal2, pVal2Type, 0,
@@ -222,6 +239,7 @@ SAL_DLLEXPORT sal_Bool SAL_CALL uno_equalData(
void * pVal1, typelib_TypeDescription * pVal1TD,
void * pVal2, typelib_TypeDescription * pVal2TD,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+ throw ()
{
return __equalData( pVal1, pVal1TD->pWeakRef, pVal1TD,
pVal2, pVal2TD->pWeakRef, pVal2TD,
@@ -232,6 +250,7 @@ SAL_DLLEXPORT sal_Bool SAL_CALL uno_type_assignData(
void * pDest, typelib_TypeDescriptionReference * pDestType,
void * pSource, typelib_TypeDescriptionReference * pSourceType,
uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ throw ()
{
return __assignData( pDest, pDestType, 0,
pSource, pSourceType, 0,
@@ -242,6 +261,7 @@ SAL_DLLEXPORT sal_Bool SAL_CALL uno_assignData(
void * pDest, typelib_TypeDescription * pDestTD,
void * pSource, typelib_TypeDescription * pSourceTD,
uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ throw ()
{
return __assignData( pDest, pDestTD->pWeakRef, pDestTD,
pSource, pSourceTD->pWeakRef, pSourceTD,
diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx
index d2fef7e6eff8..47e5be07b312 100644
--- a/cppu/source/uno/destr.hxx
+++ b/cppu/source/uno/destr.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: destr.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 15:25:53 $
+ * last change: $Author: dbo $ $Date: 2000-12-21 14:39:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,6 +77,7 @@ inline void __destructUnion(
void * pValue,
typelib_TypeDescription * pTypeDescr,
uno_ReleaseFunc release )
+ throw ()
{
typelib_TypeDescriptionReference * pType = __unionGetSetType( pValue, pTypeDescr );
::uno_type_destructData(
@@ -88,12 +89,14 @@ inline void __destructUnion(
void destructStruct(
void * pValue,
typelib_CompoundTypeDescription * pTypeDescr,
- uno_ReleaseFunc release );
+ uno_ReleaseFunc release )
+ throw ();
//--------------------------------------------------------------------------------------------------
inline void __destructStruct(
void * pValue,
typelib_CompoundTypeDescription * pTypeDescr,
uno_ReleaseFunc release )
+ throw ()
{
if (pTypeDescr->pBaseTypeDescription)
{
@@ -113,11 +116,13 @@ inline void __destructStruct(
void destructSequence(
uno_Sequence ** ppSequence,
typelib_TypeDescriptionReference * pElementType,
- uno_ReleaseFunc release );
+ uno_ReleaseFunc release )
+ throw ();
//--------------------------------------------------------------------------------------------------
inline void __destructAny(
uno_Any * pAny,
uno_ReleaseFunc release )
+ throw ()
{
typelib_TypeDescriptionReference * pType = pAny->pType;
@@ -184,6 +189,7 @@ inline sal_Int32 __destructElements(
void * pElements, typelib_TypeDescriptionReference * pElementType,
sal_Int32 nStartIndex, sal_Int32 nStopIndex,
uno_ReleaseFunc release )
+ throw ()
{
switch (pElementType->eTypeClass)
{
@@ -325,6 +331,7 @@ inline void __destructSequence(
typelib_TypeDescriptionReference * pType,
typelib_TypeDescription * pTypeDescr,
uno_ReleaseFunc release )
+ throw ()
{
if (! ::osl_decrementInterlockedCount( &pSequence->nRefCount ))
{
@@ -354,6 +361,7 @@ inline void __destructData(
typelib_TypeDescriptionReference * pType,
typelib_TypeDescription * pTypeDescr,
uno_ReleaseFunc release )
+ throw ()
{
switch (pType->eTypeClass)
{
diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx
index 4fa4fc00b239..5209bb31841b 100644
--- a/cppu/source/uno/eq.hxx
+++ b/cppu/source/uno/eq.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: eq.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: dbo $ $Date: 2000-12-08 12:20:44 $
+ * last change: $Author: dbo $ $Date: 2000-12-21 14:39:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -80,7 +80,7 @@ namespace cppu
//--------------------------------------------------------------------------------------------------
-inline sal_Bool __unoEqualObject( void * pUnoI1, void * pUnoI2 )
+inline sal_Bool __unoEqualObject( void * pUnoI1, void * pUnoI2 ) throw ()
{
if (pUnoI1 == pUnoI2)
return sal_True;
@@ -139,6 +139,7 @@ inline sal_Bool __unoEqualObject( void * pUnoI1, void * pUnoI2 )
inline sal_Bool __equalObject(
void * pI1, void * pI2,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+ throw ()
{
if (pI1 == pI2)
return sal_True;
@@ -165,12 +166,14 @@ inline sal_Bool __equalObject(
sal_Bool equalStruct(
void * pDest, void *pSource,
typelib_CompoundTypeDescription * pTypeDescr,
- uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release );
+ uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+ throw ();
//--------------------------------------------------------------------------------------------------
inline sal_Bool __equalStruct(
void * pDest, void *pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+ throw ()
{
if (pTypeDescr->pBaseTypeDescription &&
!equalStruct( pDest, pSource, pTypeDescr->pBaseTypeDescription, queryInterface, release ))
@@ -200,12 +203,14 @@ inline sal_Bool __equalStruct(
sal_Bool equalSequence(
uno_Sequence * pDest, uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
- uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release );
+ uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+ throw ();
//--------------------------------------------------------------------------------------------------
inline sal_Bool __equalSequence(
uno_Sequence * pDest, uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+ throw ()
{
if (pDest == pSource)
return sal_True;
@@ -386,6 +391,7 @@ inline sal_Bool __equalData(
void * pSource,
typelib_TypeDescriptionReference * pSourceType, typelib_TypeDescription * pSourceTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+ throw ()
{
typelib_TypeClass eSourceTypeClass, eDestTypeClass;
while (typelib_TypeClass_ANY == (eDestTypeClass = pDestType->eTypeClass))
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index d8632dc86e46..3f0eeb79ac69 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: lbenv.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: dbo $ $Date: 2000-12-15 10:17:22 $
+ * last change: $Author: dbo $ $Date: 2000-12-21 14:39:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -124,9 +124,13 @@ using namespace cppu;
using namespace com::sun::star::uno;
+namespace cppu
+{
+
//--------------------------------------------------------------------------------------------------
inline static sal_Bool td_equals( typelib_InterfaceTypeDescription * pTD1,
typelib_InterfaceTypeDescription * pTD2 )
+ throw ()
{
return (pTD1 == pTD2 ||
(((typelib_TypeDescription *)pTD1)->pTypeName->length ==
@@ -144,7 +148,7 @@ struct InterfaceEntry
typelib_InterfaceTypeDescription * pTypeDescr;
ObjectEntry * pOEntry;
- inline sal_Bool supports( typelib_InterfaceTypeDescription * pTypeDescr_ ) const;
+ inline sal_Bool supports( typelib_InterfaceTypeDescription * pTypeDescr_ ) const throw ();
};
//--------------------------------------------------------------------------------------------------
struct ObjectEntry
@@ -154,23 +158,25 @@ struct ObjectEntry
sal_Int32 nRef;
vector< InterfaceEntry > aInterfaces;
- inline ObjectEntry( uno_ExtEnvironment * pEnv, const OUString & rOId_ );
+ inline ObjectEntry( uno_ExtEnvironment * pEnv, const OUString & rOId_ ) throw ();
- inline void append( void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr,
- uno_freeProxyFunc fpFreeProxy );
- inline const InterfaceEntry * find( typelib_InterfaceTypeDescription * pTypeDescr ) const;
+ inline void append(
+ void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr,
+ uno_freeProxyFunc fpFreeProxy ) throw ();
+ inline const InterfaceEntry * find(
+ typelib_InterfaceTypeDescription * pTypeDescr ) const throw ();
};
//--------------------------------------------------------------------------------------------------
struct FctPtrHash : public unary_function< const void *, size_t >
{
- size_t operator()( const void * pKey ) const
+ size_t operator()( const void * pKey ) const throw ()
{ return (size_t)pKey; }
};
//--------------------------------------------------------------------------------------------------
struct FctOUStringHash : public unary_function< const OUString &, size_t >
{
- size_t operator()( const OUString & rKey ) const
+ size_t operator()( const OUString & rKey ) const throw ()
{ return rKey.hashCode(); }
};
@@ -188,17 +194,17 @@ struct EnvironmentsData
Mutex aMutex;
OUString2EnvironmentMap aName2EnvMap;
- ~EnvironmentsData();
+ ~EnvironmentsData() throw ();
- inline uno_Environment * getEnvironment( const OUString & rTypeName, void * pContext );
- inline sal_Bool registerEnvironment( uno_Environment * pEnv );
- inline sal_Bool revokeEnvironment( uno_Environment * pEnv );
+ inline uno_Environment * getEnvironment( const OUString & rTypeName, void * pContext ) throw ();
+ inline sal_Bool registerEnvironment( uno_Environment * pEnv ) throw ();
+ inline sal_Bool revokeEnvironment( uno_Environment * pEnv ) throw ();
inline void getRegisteredEnvironments(
uno_Environment *** pppEnvs, sal_Int32 * pnLen, uno_memAlloc memAlloc,
- const OUString & rEnvTypeName );
+ const OUString & rEnvTypeName ) throw ();
};
//--------------------------------------------------------------------------------------------------
-static EnvironmentsData & getEnvironmentsData()
+static EnvironmentsData & getEnvironmentsData() throw ()
{
static EnvironmentsData * s_p = 0;
if (! s_p)
@@ -223,12 +229,13 @@ struct uno_DefaultEnvironment : public uno_ExtEnvironment
Ptr2ObjectMap aPtr2ObjectMap;
OId2ObjectMap aOId2ObjectMap;
- uno_DefaultEnvironment( const OUString & rTypeName_, oslModule hMod_, void * pContext_ );
- ~uno_DefaultEnvironment();
+ uno_DefaultEnvironment(
+ const OUString & rTypeName_, oslModule hMod_, void * pContext_ ) throw ();
+ ~uno_DefaultEnvironment() throw ();
};
//__________________________________________________________________________________________________
-inline ObjectEntry::ObjectEntry( uno_ExtEnvironment * pEnv_, const OUString & rOId_ )
+inline ObjectEntry::ObjectEntry( uno_ExtEnvironment * pEnv_, const OUString & rOId_ ) throw ()
: pEnv( pEnv_ )
, oid( rOId_ )
, nRef( 0 )
@@ -236,8 +243,9 @@ inline ObjectEntry::ObjectEntry( uno_ExtEnvironment * pEnv_, const OUString & rO
aInterfaces.reserve( 8 );
}
//__________________________________________________________________________________________________
-inline void ObjectEntry::append( void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr,
- uno_freeProxyFunc fpFreeProxy )
+inline void ObjectEntry::append(
+ void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr,
+ uno_freeProxyFunc fpFreeProxy ) throw ()
{
InterfaceEntry aNewEntry;
if (! fpFreeProxy)
@@ -251,7 +259,8 @@ inline void ObjectEntry::append( void * pInterface, typelib_InterfaceTypeDescrip
static_cast< uno_DefaultEnvironment * >( pEnv )->aPtr2ObjectMap[ pInterface ] = this;
}
//__________________________________________________________________________________________________
-inline sal_Bool InterfaceEntry::supports( typelib_InterfaceTypeDescription * pTypeDescr_ ) const
+inline sal_Bool InterfaceEntry::supports(
+ typelib_InterfaceTypeDescription * pTypeDescr_ ) const throw ()
{
typelib_InterfaceTypeDescription * pITD = pTypeDescr;
while (pITD)
@@ -263,7 +272,8 @@ inline sal_Bool InterfaceEntry::supports( typelib_InterfaceTypeDescription * pTy
return sal_False;
}
//__________________________________________________________________________________________________
-inline const InterfaceEntry * ObjectEntry::find( typelib_InterfaceTypeDescription * pTypeDescr ) const
+inline const InterfaceEntry * ObjectEntry::find(
+ typelib_InterfaceTypeDescription * pTypeDescr ) const throw ()
{
// shortcut common case
if (((typelib_TypeDescription *)pTypeDescr)->pTypeName->length == sizeof("com.sun.star.uno.XInterface") &&
@@ -282,11 +292,13 @@ inline const InterfaceEntry * ObjectEntry::find( typelib_InterfaceTypeDescriptio
}
return 0;
}
-
+extern "C"
+{
//--------------------------------------------------------------------------------------------------
static void SAL_CALL defenv_registerInterface(
uno_ExtEnvironment * pEnv, void ** ppInterface,
rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
+ throw ()
{
OSL_ENSHURE( pEnv && ppInterface && pOId && pTypeDescr, "### null ptr!" );
const OUString & rOId = * reinterpret_cast< OUString * >( &pOId );
@@ -329,6 +341,7 @@ static void SAL_CALL defenv_registerInterface(
static void SAL_CALL defenv_registerProxyInterface(
uno_ExtEnvironment * pEnv, void ** ppInterface, uno_freeProxyFunc freeProxy,
rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
+ throw ()
{
OSL_ENSHURE( pEnv && ppInterface && pOId && pTypeDescr, "### null ptr!" );
const OUString & rOId = * reinterpret_cast< OUString * >( &pOId );
@@ -371,6 +384,7 @@ static void SAL_CALL defenv_registerProxyInterface(
//--------------------------------------------------------------------------------------------------
static void SAL_CALL defenv_revokeInterface(
uno_ExtEnvironment * pEnv, void * pInterface )
+ throw ()
{
OSL_ENSHURE( pEnv && pInterface, "### null ptr!" );
ClearableMutexGuard aGuard( static_cast< uno_DefaultEnvironment * >( pEnv )->aAccess );
@@ -412,6 +426,7 @@ static void SAL_CALL defenv_revokeInterface(
//--------------------------------------------------------------------------------------------------
static void SAL_CALL defenv_getObjectIdentifier(
uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface )
+ throw ()
{
OSL_ENSHURE( pEnv && ppOId && pInterface, "### null ptr!" );
if (*ppOId)
@@ -438,6 +453,7 @@ static void SAL_CALL defenv_getObjectIdentifier(
static void SAL_CALL defenv_getRegisteredInterface(
uno_ExtEnvironment * pEnv, void ** ppInterface,
rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
+ throw ()
{
OSL_ENSHURE( pEnv && ppInterface && pOId && pTypeDescr, "### null ptr!" );
if (*ppInterface)
@@ -462,6 +478,7 @@ static void SAL_CALL defenv_getRegisteredInterface(
//--------------------------------------------------------------------------------------------------
static void SAL_CALL defenv_getRegisteredInterfaces(
uno_ExtEnvironment * pEnv, void *** pppInterfaces, sal_Int32 * pnLen, uno_memAlloc memAlloc )
+ throw ()
{
OSL_ENSHURE( pEnv && pppInterfaces && pnLen && memAlloc, "### null ptr!" );
MutexGuard aGuard( static_cast< uno_DefaultEnvironment * >( pEnv )->aAccess );
@@ -483,11 +500,13 @@ static void SAL_CALL defenv_getRegisteredInterfaces(
}
//--------------------------------------------------------------------------------------------------
static void SAL_CALL defenv_acquire( uno_Environment * pEnv )
+ throw ()
{
osl_incrementInterlockedCount( &((uno_DefaultEnvironment *)pEnv)->nRef );
}
//--------------------------------------------------------------------------------------------------
static void SAL_CALL defenv_release( uno_Environment * pEnv )
+ throw ()
{
MutexGuard aGuard( getEnvironmentsData().aMutex );
if (! osl_decrementInterlockedCount( &((uno_DefaultEnvironment *)pEnv)->nRef ))
@@ -498,12 +517,14 @@ static void SAL_CALL defenv_release( uno_Environment * pEnv )
}
//--------------------------------------------------------------------------------------------------
static void SAL_CALL defenv_dispose( uno_Environment * pEnv )
+ throw ()
{
}
+}
//__________________________________________________________________________________________________
uno_DefaultEnvironment::uno_DefaultEnvironment(
- const OUString & rTypeName_, void * pContext_, oslModule hMod_ )
+ const OUString & rTypeName_, void * pContext_, oslModule hMod_ ) throw ()
: nRef( 0 )
, hModule( hMod_ )
{
@@ -530,7 +551,7 @@ uno_DefaultEnvironment::uno_DefaultEnvironment(
}
//__________________________________________________________________________________________________
-uno_DefaultEnvironment::~uno_DefaultEnvironment()
+uno_DefaultEnvironment::~uno_DefaultEnvironment() throw ()
{
OSL_ENSHURE( aOId2ObjectMap.empty(), "### object entries left!" );
@@ -543,7 +564,7 @@ uno_DefaultEnvironment::~uno_DefaultEnvironment()
}
//==================================================================================================
-static void writeLine( void * stream, const sal_Char * pLine, const sal_Char * pFilter )
+static void writeLine( void * stream, const sal_Char * pLine, const sal_Char * pFilter ) throw ()
{
if (pFilter && *pFilter)
{
@@ -585,7 +606,7 @@ static void writeLine( void * stream, const sal_Char * pLine, const sal_Char * p
}
}
//==================================================================================================
-static void writeLine( void * stream, const OUString & rLine, const sal_Char * pFilter )
+static void writeLine( void * stream, const OUString & rLine, const sal_Char * pFilter ) throw ()
{
OString aLine( OUStringToOString( rLine, RTL_TEXTENCODING_ASCII_US ) );
writeLine( stream, aLine.getStr(), pFilter );
@@ -593,7 +614,7 @@ static void writeLine( void * stream, const OUString & rLine, const sal_Char * p
//##################################################################################################
extern "C" SAL_DLLEXPORT void SAL_CALL uno_dumpEnvironment(
- void * stream, uno_Environment * pEnv, const sal_Char * pFilter )
+ void * stream, uno_Environment * pEnv, const sal_Char * pFilter ) throw ()
{
OSL_ENSHURE( pEnv, "### null ptr!" );
OUStringBuffer buf;
@@ -654,7 +675,7 @@ extern "C" SAL_DLLEXPORT void SAL_CALL uno_dumpEnvironment(
}
//##################################################################################################
extern "C" SAL_DLLEXPORT void SAL_CALL uno_dumpEnvironmentByName(
- void * stream, rtl_uString * pEnvTypeName, const sal_Char * pFilter )
+ void * stream, rtl_uString * pEnvTypeName, const sal_Char * pFilter ) throw ()
{
uno_Environment * pEnv = 0;
uno_getEnvironment( &pEnv, pEnvTypeName, 0 );
@@ -674,7 +695,7 @@ extern "C" SAL_DLLEXPORT void SAL_CALL uno_dumpEnvironmentByName(
}
//--------------------------------------------------------------------------------------------------
-inline static const OUString & unoenv_getStaticOIdPart()
+inline static const OUString & unoenv_getStaticOIdPart() throw ()
{
static OUString * s_pStaticOidPart = 0;
if (! s_pStaticOidPart)
@@ -704,9 +725,11 @@ inline static const OUString & unoenv_getStaticOIdPart()
}
return *s_pStaticOidPart;
}
+extern "C"
+{
//--------------------------------------------------------------------------------------------------
static void SAL_CALL unoenv_computeObjectIdentifier(
- uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface )
+ uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface ) throw ()
{
OSL_ENSHURE( pEnv && ppOId && pInterface, "### null ptr!" );
if (*ppOId)
@@ -757,18 +780,19 @@ static void SAL_CALL unoenv_computeObjectIdentifier(
typelib_typedescription_release( pMTqueryInterface );
}
//==================================================================================================
-static void SAL_CALL unoenv_acquireInterface( uno_ExtEnvironment *, void * pUnoI )
+static void SAL_CALL unoenv_acquireInterface( uno_ExtEnvironment *, void * pUnoI ) throw ()
{
(*((uno_Interface *)pUnoI)->acquire)( (uno_Interface *)pUnoI );
}
//==================================================================================================
-static void SAL_CALL unoenv_releaseInterface( uno_ExtEnvironment *, void * pUnoI )
+static void SAL_CALL unoenv_releaseInterface( uno_ExtEnvironment *, void * pUnoI ) throw ()
{
(*((uno_Interface *)pUnoI)->release)( (uno_Interface *)pUnoI );
}
+}
//__________________________________________________________________________________________________
-EnvironmentsData::~EnvironmentsData()
+EnvironmentsData::~EnvironmentsData() throw ()
{
MutexGuard aGuard( aMutex );
@@ -790,7 +814,7 @@ EnvironmentsData::~EnvironmentsData()
}
//__________________________________________________________________________________________________
inline uno_Environment * EnvironmentsData::getEnvironment(
- const OUString & rEnvTypeName, void * pContext )
+ const OUString & rEnvTypeName, void * pContext ) throw ()
{
uno_Environment * pEnv = 0;
@@ -809,7 +833,7 @@ inline uno_Environment * EnvironmentsData::getEnvironment(
return pEnv;
}
//__________________________________________________________________________________________________
-inline sal_Bool EnvironmentsData::registerEnvironment( uno_Environment * pEnv )
+inline sal_Bool EnvironmentsData::registerEnvironment( uno_Environment * pEnv ) throw ()
{
OSL_ENSHURE( pEnv, "### null ptr!" );
OUString aKey( OUString::valueOf( (sal_Int64)pEnv->pContext ) );
@@ -827,7 +851,7 @@ inline sal_Bool EnvironmentsData::registerEnvironment( uno_Environment * pEnv )
return sal_False;
}
//__________________________________________________________________________________________________
-inline sal_Bool EnvironmentsData::revokeEnvironment( uno_Environment * pEnv )
+inline sal_Bool EnvironmentsData::revokeEnvironment( uno_Environment * pEnv ) throw ()
{
OSL_ENSHURE( pEnv, "### null ptr!" );
OUString aKey( OUString::valueOf( (sal_Int64)pEnv->pContext ) );
@@ -841,7 +865,7 @@ inline sal_Bool EnvironmentsData::revokeEnvironment( uno_Environment * pEnv )
//__________________________________________________________________________________________________
inline void EnvironmentsData::getRegisteredEnvironments(
uno_Environment *** pppEnvs, sal_Int32 * pnLen, uno_memAlloc memAlloc,
- const OUString & rEnvTypeName )
+ const OUString & rEnvTypeName ) throw ()
{
OSL_ENSHURE( pppEnvs && pnLen && memAlloc, "### null ptr!" );
@@ -880,9 +904,11 @@ inline void EnvironmentsData::getRegisteredEnvironments(
*pppEnvs = 0;
}
}
-
+extern "C"
+{
//--------------------------------------------------------------------------------------------------
-static uno_Environment * initDefaultEnvironment( const OUString & rEnvTypeName, void * pContext )
+static uno_Environment * initDefaultEnvironment(
+ const OUString & rEnvTypeName, void * pContext ) throw ()
{
uno_Environment * pEnv = 0;
@@ -942,15 +968,16 @@ static uno_Environment * initDefaultEnvironment( const OUString & rEnvTypeName,
}
//--------------------------------------------------------------------------------------------------
-static void SAL_CALL anonymous_defenv_release( uno_Environment * pEnv )
+static void SAL_CALL anonymous_defenv_release( uno_Environment * pEnv ) throw ()
{
if (! osl_decrementInterlockedCount( &((uno_DefaultEnvironment *)pEnv)->nRef ))
delete (uno_DefaultEnvironment *)pEnv;
}
+}
//##################################################################################################
extern "C" SAL_DLLEXPORT void SAL_CALL uno_createEnvironment(
- uno_Environment ** ppEnv, rtl_uString * pEnvTypeName, void * pContext )
+ uno_Environment ** ppEnv, rtl_uString * pEnvTypeName, void * pContext ) throw ()
{
OSL_ENSHURE( ppEnv, "### null ptr!" );
if (*ppEnv)
@@ -963,7 +990,7 @@ extern "C" SAL_DLLEXPORT void SAL_CALL uno_createEnvironment(
//##################################################################################################
extern "C" SAL_DLLEXPORT void SAL_CALL uno_getEnvironment(
- uno_Environment ** ppEnv, rtl_uString * pEnvTypeName, void * pContext )
+ uno_Environment ** ppEnv, rtl_uString * pEnvTypeName, void * pContext ) throw ()
{
OSL_ENSHURE( ppEnv, "### null ptr!" );
if (*ppEnv)
@@ -984,9 +1011,11 @@ extern "C" SAL_DLLEXPORT void SAL_CALL uno_getEnvironment(
//##################################################################################################
extern "C" SAL_DLLEXPORT void SAL_CALL uno_getRegisteredEnvironments(
uno_Environment *** pppEnvs, sal_Int32 * pnLen, uno_memAlloc memAlloc,
- rtl_uString * pEnvTypeName )
+ rtl_uString * pEnvTypeName ) throw ()
{
getEnvironmentsData().getRegisteredEnvironments(
pppEnvs, pnLen, memAlloc,
(pEnvTypeName ? OUString( pEnvTypeName ) : OUString()) );
}
+
+}
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 567dae6d9f7d..63831a65f3c7 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: lbmap.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: dbo $ $Date: 2000-12-15 10:17:22 $
+ * last change: $Author: dbo $ $Date: 2000-12-21 14:39:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -111,6 +111,9 @@ using namespace rtl;
using namespace com::sun::star::uno;
+namespace cppu
+{
+
//==================================================================================================
struct MappingEntry
{
@@ -119,8 +122,9 @@ struct MappingEntry
uno_freeMappingFunc freeMapping;
OUString aMappingName;
- MappingEntry( uno_Mapping * pMapping_, uno_freeMappingFunc freeMapping_,
- const OUString & rMappingName_ )
+ MappingEntry(
+ uno_Mapping * pMapping_, uno_freeMappingFunc freeMapping_,
+ const OUString & rMappingName_ ) throw ()
: nRef( 1 )
, pMapping( pMapping_ )
, freeMapping( freeMapping_ )
@@ -130,13 +134,13 @@ struct MappingEntry
//--------------------------------------------------------------------------------------------------
struct FctOUStringHash : public unary_function< const OUString &, size_t >
{
- size_t operator()( const OUString & rKey ) const
+ size_t operator()( const OUString & rKey ) const throw ()
{ return (size_t)rKey.hashCode(); }
};
//--------------------------------------------------------------------------------------------------
struct FctPtrHash : public unary_function< uno_Mapping *, size_t >
{
- size_t operator()( uno_Mapping * pKey ) const
+ size_t operator()( uno_Mapping * pKey ) const throw ()
{ return (size_t)pKey; }
};
@@ -158,10 +162,10 @@ struct MappingsData
Mutex aNegativeLibsMutex;
t_OUStringSet aNegativeLibs;
- ~MappingsData();
+ ~MappingsData() throw ();
};
//__________________________________________________________________________________________________
-MappingsData::~MappingsData()
+MappingsData::~MappingsData() throw ()
{
#ifdef CPPU_ASSERTIONS
OSL_ENSHURE( aName2Entry.empty() && aMapping2Entry.empty(), "### unrevoked mappings!" );
@@ -185,7 +189,7 @@ MappingsData::~MappingsData()
#endif
}
//--------------------------------------------------------------------------------------------------
-static MappingsData & getMappingsData()
+static MappingsData & getMappingsData() throw ()
{
static MappingsData * s_p = 0;
if (! s_p)
@@ -216,38 +220,47 @@ struct uno_Mediate_Mapping : public uno_Mapping
OUString aAddPurpose;
- uno_Mediate_Mapping( const Environment & rFrom_, const Environment & rTo_,
- const Mapping & rFrom2Uno_, const Mapping & rUno2To_,
- const OUString & rAddPurpose );
+ uno_Mediate_Mapping(
+ const Environment & rFrom_, const Environment & rTo_,
+ const Mapping & rFrom2Uno_, const Mapping & rUno2To_,
+ const OUString & rAddPurpose )
+ throw ();
};
+extern "C"
+{
//--------------------------------------------------------------------------------------------------
-static void SAL_CALL mediate_free( uno_Mapping * pMapping )
+static void SAL_CALL mediate_free( uno_Mapping * pMapping ) throw ()
{
delete static_cast< uno_Mediate_Mapping * >( pMapping );
}
//--------------------------------------------------------------------------------------------------
-static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
+static void SAL_CALL mediate_acquire( uno_Mapping * pMapping ) throw ()
{
- if (1 == osl_incrementInterlockedCount( & static_cast< uno_Mediate_Mapping * >( pMapping )->nRef ))
+ if (1 == osl_incrementInterlockedCount(
+ & static_cast< uno_Mediate_Mapping * >( pMapping )->nRef ))
{
- uno_registerMapping( &pMapping, mediate_free,
- static_cast< uno_Mediate_Mapping * >( pMapping )->aFrom.get(),
- static_cast< uno_Mediate_Mapping * >( pMapping )->aTo.get(),
- static_cast< uno_Mediate_Mapping * >( pMapping )->aAddPurpose.pData );
+ uno_registerMapping(
+ &pMapping, mediate_free,
+ static_cast< uno_Mediate_Mapping * >( pMapping )->aFrom.get(),
+ static_cast< uno_Mediate_Mapping * >( pMapping )->aTo.get(),
+ static_cast< uno_Mediate_Mapping * >( pMapping )->aAddPurpose.pData );
}
}
//--------------------------------------------------------------------------------------------------
-static void SAL_CALL mediate_release( uno_Mapping * pMapping )
+static void SAL_CALL mediate_release( uno_Mapping * pMapping ) throw ()
{
- if (! osl_decrementInterlockedCount( & static_cast< uno_Mediate_Mapping * >( pMapping )->nRef ))
+ if (! osl_decrementInterlockedCount(
+ & static_cast< uno_Mediate_Mapping * >( pMapping )->nRef ))
{
uno_revokeMapping( pMapping );
}
}
//--------------------------------------------------------------------------------------------------
-static void SAL_CALL mediate_mapInterface( uno_Mapping * pMapping,
- void ** ppOut, void * pInterface,
- typelib_InterfaceTypeDescription * pInterfaceTypeDescr )
+static void SAL_CALL mediate_mapInterface(
+ uno_Mapping * pMapping,
+ void ** ppOut, void * pInterface,
+ typelib_InterfaceTypeDescription * pInterfaceTypeDescr )
+ throw ()
{
OSL_ENSHURE( pMapping && ppOut, "### null ptr!" );
if (pMapping && ppOut)
@@ -265,10 +278,12 @@ static void SAL_CALL mediate_mapInterface( uno_Mapping * pMapping,
}
}
}
+}
//__________________________________________________________________________________________________
-uno_Mediate_Mapping::uno_Mediate_Mapping( const Environment & rFrom_, const Environment & rTo_,
- const Mapping & rFrom2Uno_, const Mapping & rUno2To_,
- const OUString & rAddPurpose_ )
+uno_Mediate_Mapping::uno_Mediate_Mapping(
+ const Environment & rFrom_, const Environment & rTo_,
+ const Mapping & rFrom2Uno_, const Mapping & rUno2To_,
+ const OUString & rAddPurpose_ ) throw ()
: nRef( 1 )
, aFrom( rFrom_ )
, aTo( rTo_ )
@@ -284,6 +299,7 @@ uno_Mediate_Mapping::uno_Mediate_Mapping( const Environment & rFrom_, const Envi
//==================================================================================================
static inline OUString getMappingName(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose )
+ throw ()
{
OUStringBuffer aKey( 64 );
aKey.append( rAddPurpose );
@@ -301,6 +317,7 @@ static inline OUString getMappingName(
//==================================================================================================
static inline OUString getBridgeName(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose )
+ throw ()
{
OUStringBuffer aBridgeName( 16 );
if (rAddPurpose.getLength())
@@ -314,14 +331,14 @@ static inline OUString getBridgeName(
return aBridgeName.makeStringAndClear();
}
//==================================================================================================
-static inline void setNegativeBridge( const OUString & rBridgeName )
+static inline void setNegativeBridge( const OUString & rBridgeName ) throw ()
{
MappingsData & rData = getMappingsData();
MutexGuard aGuard( rData.aNegativeLibsMutex );
rData.aNegativeLibs.insert( rBridgeName );
}
//==================================================================================================
-static inline oslModule loadModule( const OUString & rBridgeName )
+static inline oslModule loadModule( const OUString & rBridgeName ) throw ()
{
sal_Bool bNeg;
{
@@ -363,6 +380,7 @@ static inline oslModule loadModule( const OUString & rBridgeName )
//==================================================================================================
static Mapping loadExternalMapping(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose )
+ throw ()
{
OSL_ASSERT( rFrom.is() && rTo.is() );
if (rFrom.is() && rTo.is())
@@ -407,6 +425,7 @@ static Mapping loadExternalMapping(
//==================================================================================================
static Mapping getDirectMapping(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose = OUString() )
+ throw ()
{
OSL_ASSERT( rFrom.is() && rTo.is() );
if (rFrom.is() && rTo.is())
@@ -436,6 +455,7 @@ static inline Mapping createMediateMapping(
const Environment & rFrom, const Environment & rTo,
const Mapping & rFrom2Uno, const Mapping & rUno2To,
const OUString & rAddPurpose )
+ throw ()
{
uno_Mapping * pRet = new uno_Mediate_Mapping(
rFrom, rTo, rFrom2Uno, rUno2To, rAddPurpose ); // ref count initially 1
@@ -448,6 +468,7 @@ static inline Mapping createMediateMapping(
//==================================================================================================
static Mapping getMediateMapping(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose )
+ throw ()
{
Environment aUno;
Mapping aUno2To;
@@ -506,7 +527,9 @@ static Mapping getMediateMapping(
//##################################################################################################
extern "C" SAL_DLLEXPORT void SAL_CALL uno_getMapping(
- uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo, rtl_uString * pAddPurpose )
+ uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo,
+ rtl_uString * pAddPurpose )
+ throw ()
{
OSL_ENSHURE( ppMapping && pFrom && pTo, "### null ptr!" );
if (*ppMapping)
@@ -560,7 +583,9 @@ extern "C" SAL_DLLEXPORT void SAL_CALL uno_getMapping(
}
//##################################################################################################
extern "C" SAL_DLLEXPORT void SAL_CALL uno_getMappingByName(
- uno_Mapping ** ppMapping, rtl_uString * pFrom, rtl_uString * pTo, rtl_uString * pAddPurpose )
+ uno_Mapping ** ppMapping, rtl_uString * pFrom, rtl_uString * pTo,
+ rtl_uString * pAddPurpose )
+ throw ()
{
OSL_ENSHURE( ppMapping && pFrom && pTo, "### null ptr!" );
if (*ppMapping)
@@ -590,6 +615,7 @@ extern "C" SAL_DLLEXPORT void SAL_CALL uno_getMappingByName(
extern "C" SAL_DLLEXPORT void SAL_CALL uno_registerMapping(
uno_Mapping ** ppMapping, uno_freeMappingFunc freeMapping,
uno_Environment * pFrom, uno_Environment * pTo, rtl_uString * pAddPurpose )
+ throw ()
{
MappingsData & rData = getMappingsData();
ClearableMutexGuard aGuard( rData.aMappingsMutex );
@@ -626,7 +652,9 @@ extern "C" SAL_DLLEXPORT void SAL_CALL uno_registerMapping(
}
}
//##################################################################################################
-extern "C" SAL_DLLEXPORT void SAL_CALL uno_revokeMapping( uno_Mapping * pMapping )
+extern "C" SAL_DLLEXPORT void SAL_CALL uno_revokeMapping(
+ uno_Mapping * pMapping )
+ throw ()
{
MappingsData & rData = getMappingsData();
ClearableMutexGuard aGuard( rData.aMappingsMutex );
@@ -651,7 +679,9 @@ extern "C" SAL_DLLEXPORT void SAL_CALL uno_revokeMapping( uno_Mapping * pMapping
}
//##################################################################################################
-extern "C" SAL_DLLEXPORT void SAL_CALL uno_registerMappingCallback( uno_getMappingFunc pCallback )
+extern "C" SAL_DLLEXPORT void SAL_CALL uno_registerMappingCallback(
+ uno_getMappingFunc pCallback )
+ throw ()
{
OSL_ENSHURE( pCallback, "### null ptr!" );
MappingsData & rData = getMappingsData();
@@ -659,10 +689,14 @@ extern "C" SAL_DLLEXPORT void SAL_CALL uno_registerMappingCallback( uno_getMappi
rData.aCallbacks.insert( pCallback );
}
//##################################################################################################
-extern "C" SAL_DLLEXPORT void SAL_CALL uno_revokeMappingCallback( uno_getMappingFunc pCallback )
+extern "C" SAL_DLLEXPORT void SAL_CALL uno_revokeMappingCallback(
+ uno_getMappingFunc pCallback )
+ throw ()
{
OSL_ENSHURE( pCallback, "### null ptr!" );
MappingsData & rData = getMappingsData();
MutexGuard aGuard( rData.aCallbacksMutex );
rData.aCallbacks.erase( pCallback );
}
+
+}
diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx
index 4f589b4caf2d..69fef3ddceef 100644
--- a/cppu/source/uno/prim.hxx
+++ b/cppu/source/uno/prim.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: prim.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 15:25:53 $
+ * last change: $Author: dbo $ $Date: 2000-12-21 14:39:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -107,7 +107,7 @@ inline void * __map(
void * p,
typelib_TypeDescriptionReference * pType,
typelib_TypeDescription * pTypeDescr,
- uno_Mapping * mapping )
+ uno_Mapping * mapping ) throw ()
{
void * pRet = 0;
if (p)
@@ -126,7 +126,7 @@ inline void * __map(
return pRet;
}
//--------------------------------------------------------------------------------------------------
-inline void __acquire( void * p, uno_AcquireFunc acquire )
+inline void __acquire( void * p, uno_AcquireFunc acquire ) throw ()
{
if (p)
{
@@ -137,7 +137,7 @@ inline void __acquire( void * p, uno_AcquireFunc acquire )
}
}
//--------------------------------------------------------------------------------------------------
-inline void __releaseRef( void ** pRef, uno_ReleaseFunc release )
+inline void __releaseRef( void ** pRef, uno_ReleaseFunc release ) throw ()
{
if (*pRef)
{
@@ -154,7 +154,7 @@ inline void __releaseRef( void ** pRef, uno_ReleaseFunc release )
//--------------------------------------------------------------------------------------------------
static uno_Sequence * s_pSeq = 0;
static uno_Sequence s_seq;
-inline uno_Sequence * __getEmptySequence()
+inline uno_Sequence * __getEmptySequence() throw ()
{
if (! s_pSeq)
{
@@ -171,7 +171,7 @@ inline uno_Sequence * __getEmptySequence()
}
//--------------------------------------------------------------------------------------------------
static typelib_TypeDescriptionReference * s_pVoidType = 0;
-inline typelib_TypeDescriptionReference * __getVoidType()
+inline typelib_TypeDescriptionReference * __getVoidType() throw ()
{
if (! s_pVoidType)
{
@@ -201,7 +201,7 @@ inline typelib_TypeDescriptionReference * __getVoidType()
//--------------------------------------------------------------------------------------------------
static typelib_TypeDescription * s_pQITD = 0;
-inline typelib_TypeDescription * __getQueryInterfaceTypeDescr()
+inline typelib_TypeDescription * __getQueryInterfaceTypeDescr() throw ()
{
if (! s_pQITD)
{
@@ -224,7 +224,7 @@ inline typelib_TypeDescription * __getQueryInterfaceTypeDescr()
//--------------------------------------------------------------------------------------------------
inline typelib_TypeDescriptionReference * __unionGetSetType(
- void * pUnion, typelib_TypeDescription * pTD )
+ void * pUnion, typelib_TypeDescription * pTD ) throw ()
{
typelib_TypeDescriptionReference * pRet;
@@ -248,8 +248,8 @@ inline typelib_TypeDescriptionReference * __unionGetSetType(
}
//--------------------------------------------------------------------------------------------------
inline sal_Bool __type_equals(
- typelib_TypeDescriptionReference * pType1,
- typelib_TypeDescriptionReference * pType2 )
+ typelib_TypeDescriptionReference * pType1, typelib_TypeDescriptionReference * pType2 )
+ throw ()
{
return (pType1 == pType2 ||
(pType1->eTypeClass == pType2->eTypeClass &&
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index bee8debe068f..6ecc1af54509 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: sequence.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: dbo $ $Date: 2000-12-08 12:20:09 $
+ * last change: $Author: dbo $ $Date: 2000-12-21 14:39:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -95,7 +95,7 @@ namespace cppu
{
//--------------------------------------------------------------------------------------------------
static inline void allocSeq(
- uno_Sequence ** ppSeq, sal_Int32 nElementSize, sal_Int32 nElements )
+ uno_Sequence ** ppSeq, sal_Int32 nElementSize, sal_Int32 nElements ) throw ()
{
if (nElements)
{
@@ -114,6 +114,7 @@ inline void __defaultConstructElements(
typelib_TypeDescriptionReference * pElementType,
sal_Int32 nStartIndex, sal_Int32 nStopIndex,
sal_Int32 nAlloc = 0 ) // >= 0 means (re)alloc memory for nAlloc elements
+ throw ()
{
switch (pElementType->eTypeClass)
{
@@ -310,6 +311,7 @@ inline void __copyConstructElements(
sal_Int32 nStartIndex, sal_Int32 nStopIndex,
uno_AcquireFunc acquire,
sal_Int32 nAlloc = 0 )
+ throw ()
{
switch (pElementType->eTypeClass)
{
@@ -527,6 +529,7 @@ inline void __reallocSequence(
typelib_TypeDescriptionReference * pElementType,
sal_Int32 nSize,
uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ throw ()
{
uno_Sequence * pSource = *ppSequence;
sal_Int32 nSourceElements = pSource->nElements;
@@ -596,6 +599,7 @@ SAL_DLLEXPORT void SAL_CALL uno_type_sequence_construct(
uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pType,
void * pElements, sal_Int32 len,
uno_AcquireFunc acquire )
+ throw ()
{
if (len)
{
@@ -637,6 +641,7 @@ SAL_DLLEXPORT void SAL_CALL uno_sequence_construct(
uno_Sequence ** ppSequence, typelib_TypeDescription * pTypeDescr,
void * pElements, sal_Int32 len,
uno_AcquireFunc acquire )
+ throw ()
{
if (len)
{
@@ -672,6 +677,7 @@ SAL_DLLEXPORT void SAL_CALL uno_sequence_construct(
SAL_DLLEXPORT void SAL_CALL uno_type_sequence_realloc(
uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pType, sal_Int32 nSize,
uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ throw ()
{
OSL_ENSHURE( ppSequence, "### null ptr!" );
OSL_ENSHURE( nSize >= 0, "### new size must be at least 0!" );
@@ -690,6 +696,7 @@ SAL_DLLEXPORT void SAL_CALL uno_type_sequence_realloc(
SAL_DLLEXPORT void SAL_CALL uno_sequence_realloc(
uno_Sequence ** ppSequence, typelib_TypeDescription * pTypeDescr, sal_Int32 nSize,
uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ throw ()
{
OSL_ENSHURE( ppSequence, "### null ptr!" );
OSL_ENSHURE( nSize >= 0, "### new size must be at least 0!" );
@@ -706,6 +713,7 @@ SAL_DLLEXPORT void SAL_CALL uno_type_sequence_reference2One(
uno_Sequence ** ppSequence,
typelib_TypeDescriptionReference * pType,
uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ throw ()
{
OSL_ENSHURE( ppSequence, "### null ptr!" );
uno_Sequence * pSequence = *ppSequence;
@@ -744,6 +752,7 @@ SAL_DLLEXPORT void SAL_CALL uno_sequence_reference2One(
uno_Sequence ** ppSequence,
typelib_TypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ throw ()
{
OSL_ENSHURE( ppSequence, "### null ptr!" );
uno_Sequence * pSequence = *ppSequence;
@@ -778,6 +787,7 @@ SAL_DLLEXPORT void SAL_CALL uno_sequence_assign(
uno_Sequence * pSource,
typelib_TypeDescription * pTypeDescr,
uno_ReleaseFunc release )
+ throw ()
{
if (*ppDest != pSource)
{
@@ -792,6 +802,7 @@ SAL_DLLEXPORT void SAL_CALL uno_type_sequence_assign(
uno_Sequence * pSource,
typelib_TypeDescriptionReference * pType,
uno_ReleaseFunc release )
+ throw ()
{
if (*ppDest != pSource)
{