mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanup: ( () ) replaced by (())

Browse Source
This commit is contained in:
Alexander Bergmann
2012-01-26 16:00:09 +01:00
committed by Michael Meeks
parent f1cb0a4ab4
commit 0439af27e1
173 changed files with 1406 additions and 1406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cppu/source/helper/purpenv/Proxy.hxx
View File

@@ -68,7 +68,7 @@ public:
rtl::OUString const & rOId,
cppu::helper::purpenv::ProbeFun * probeFun,
void * pProbeContext)
SAL_THROW( () );
SAL_THROW(());
~Proxy(void);
void acquire(void);

4
cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
View File

@@ -128,14 +128,14 @@ Mapping::Mapping(uno_Environment * pFrom,
uno_Environment * pTo,
cppu::helper::purpenv::ProbeFun * probeFun,
void * pProbeContext
) SAL_THROW( () )
) SAL_THROW(())
: m_from (pFrom),
m_to (pTo),
m_nCount (1),
m_probeFun(probeFun),
m_pContext(pProbeContext)
{
LOG_LIFECYCLE_cppu_helper_purpenv_Mapping_emit(fprintf(stderr, "LIFE: %s -> %p\n", "Mapping::Mapping(uno_Environment * pFrom, uno_Environment * pTo) SAL_THROW( () )", this));
LOG_LIFECYCLE_cppu_helper_purpenv_Mapping_emit(fprintf(stderr, "LIFE: %s -> %p\n", "Mapping::Mapping(uno_Environment * pFrom, uno_Environment * pTo) SAL_THROW(())", this));
uno_Mapping::acquire = s_acquire;
uno_Mapping::release = s_release;

2
cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
View File

@@ -50,7 +50,7 @@ using namespace com::sun::star;
static bool relatesToInterface(typelib_TypeDescription * pTypeDescr)
SAL_THROW( () )
SAL_THROW(())
{
switch (pTypeDescr->eTypeClass)
{

14
cppu/source/threadpool/current.cxx
View File

@@ -124,19 +124,19 @@ class ThreadKey
oslThreadKeyCallbackFunction _pCallback;
public:
inline oslThreadKey getThreadKey() SAL_THROW( () );
inline oslThreadKey getThreadKey() SAL_THROW(());
inline ThreadKey( oslThreadKeyCallbackFunction pCallback ) SAL_THROW( () );
inline ~ThreadKey() SAL_THROW( () );
inline ThreadKey( oslThreadKeyCallbackFunction pCallback ) SAL_THROW(());
inline ~ThreadKey() SAL_THROW(());
};
//__________________________________________________________________________________________________
inline ThreadKey::ThreadKey( oslThreadKeyCallbackFunction pCallback ) SAL_THROW( () )
inline ThreadKey::ThreadKey( oslThreadKeyCallbackFunction pCallback ) SAL_THROW(())
: _bInit( sal_False )
, _pCallback( pCallback )
{
}
//__________________________________________________________________________________________________
inline ThreadKey::~ThreadKey() SAL_THROW( () )
inline ThreadKey::~ThreadKey() SAL_THROW(())
{
if (_bInit)
{
@@ -144,7 +144,7 @@ inline ThreadKey::~ThreadKey() SAL_THROW( () )
}
}
//__________________________________________________________________________________________________
inline oslThreadKey ThreadKey::getThreadKey() SAL_THROW( () )
inline oslThreadKey ThreadKey::getThreadKey() SAL_THROW(())
{
if (! _bInit)
{
@@ -180,7 +180,7 @@ extern "C" void SAL_CALL delete_IdContainer( void * p )
}
}
//==================================================================================================
IdContainer * getIdContainer() SAL_THROW( () )
IdContainer * getIdContainer() SAL_THROW(())
{
static ThreadKey s_key( delete_IdContainer );
oslThreadKey aKey = s_key.getThreadKey();

2
cppu/source/threadpool/current.hxx
View File

@@ -45,7 +45,7 @@ struct IdContainer
sal_Sequence * pCurrentId;
};
IdContainer * getIdContainer() SAL_THROW( () );
IdContainer * getIdContainer() SAL_THROW(());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
cppu/source/typelib/static_types.cxx
View File

@@ -99,7 +99,7 @@ struct AlignSize_Impl
static sal_Int32 nMaxAlignment = (sal_Int32)( (sal_Size)(&((AlignSize_Impl *) 16)->dDouble) - 16);
static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment )
SAL_THROW( () )
SAL_THROW(())
{
if( nRequestedAlignment > nMaxAlignment )
nRequestedAlignment = nMaxAlignment;
@@ -111,7 +111,7 @@ static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment )
*/
static inline sal_Int32 newAlignedSize(
sal_Int32 OldSize, sal_Int32 ElementSize, sal_Int32 NeededAlignment )
SAL_THROW( () )
SAL_THROW(())
{
NeededAlignment = adjustAlignment( NeededAlignment );
return (OldSize + NeededAlignment -1) / NeededAlignment * NeededAlignment + ElementSize;
@@ -126,7 +126,7 @@ namespace
// !for NOT REALLY WEAK TYPES only!
static inline typelib_TypeDescriptionReference * igetTypeByName( rtl_uString * pTypeName )
SAL_THROW( () )
SAL_THROW(())
{
typelib_TypeDescriptionReference * pRef = 0;
::typelib_typedescriptionreference_getByName( &pRef, pTypeName );

30
cppu/source/typelib/typelib.cxx
View File

@@ -89,7 +89,7 @@ struct AlignSize_Impl
static sal_Int32 nMaxAlignment = (sal_Int32)( (sal_Size)(&((AlignSize_Impl *) 16)->dDouble) - 16);
static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment )
SAL_THROW( () )
SAL_THROW(())
{
if( nRequestedAlignment > nMaxAlignment )
nRequestedAlignment = nMaxAlignment;
@@ -101,20 +101,20 @@ static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment )
*/
static inline sal_Int32 newAlignedSize(
sal_Int32 OldSize, sal_Int32 ElementSize, sal_Int32 NeededAlignment )
SAL_THROW( () )
SAL_THROW(())
{
NeededAlignment = adjustAlignment( NeededAlignment );
return (OldSize + NeededAlignment -1) / NeededAlignment * NeededAlignment + ElementSize;
}
static inline sal_Bool reallyWeak( typelib_TypeClass eTypeClass )
SAL_THROW( () )
SAL_THROW(())
{
return TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( eTypeClass );
}
static inline sal_Int32 getDescriptionSize( typelib_TypeClass eTypeClass )
SAL_THROW( () )
SAL_THROW(())
{
OSL_ASSERT( typelib_TypeClass_TYPEDEF != eTypeClass );
@@ -175,14 +175,14 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_getByName(
//-----------------------------------------------------------------------------
struct equalStr_Impl
{
sal_Bool operator()(const sal_Unicode * const & s1, const sal_Unicode * const & s2) const SAL_THROW( () )
sal_Bool operator()(const sal_Unicode * const & s1, const sal_Unicode * const & s2) const SAL_THROW(())
{ return 0 == rtl_ustr_compare( s1, s2 ); }
};
//-----------------------------------------------------------------------------
struct hashStr_Impl
{
size_t operator()(const sal_Unicode * const & s) const SAL_THROW( () )
size_t operator()(const sal_Unicode * const & s) const SAL_THROW(())
{ return rtl_ustr_hashCode( s ); }
};
@@ -211,9 +211,9 @@ struct TypeDescriptor_Init_Impl
// The mutex to guard all type library accesses
Mutex * pMutex;
inline Mutex & getMutex() SAL_THROW( () );
inline Mutex & getMutex() SAL_THROW(());
inline void callChain( typelib_TypeDescription ** ppRet, rtl_uString * pName ) SAL_THROW( () );
inline void callChain( typelib_TypeDescription ** ppRet, rtl_uString * pName ) SAL_THROW(());
#if OSL_DEBUG_LEVEL > 1
// only for debugging
@@ -241,10 +241,10 @@ struct TypeDescriptor_Init_Impl
#endif
{}
~TypeDescriptor_Init_Impl() SAL_THROW( () );
~TypeDescriptor_Init_Impl() SAL_THROW(());
};
//__________________________________________________________________________________________________
inline Mutex & TypeDescriptor_Init_Impl::getMutex() SAL_THROW( () )
inline Mutex & TypeDescriptor_Init_Impl::getMutex() SAL_THROW(())
{
if( !pMutex )
{
@@ -257,7 +257,7 @@ inline Mutex & TypeDescriptor_Init_Impl::getMutex() SAL_THROW( () )
//__________________________________________________________________________________________________
inline void TypeDescriptor_Init_Impl::callChain(
typelib_TypeDescription ** ppRet, rtl_uString * pName )
SAL_THROW( () )
SAL_THROW(())
{
if (pCallbacks)
{
@@ -279,7 +279,7 @@ inline void TypeDescriptor_Init_Impl::callChain(
}
//__________________________________________________________________________________________________
TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () )
TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW(())
{
if( pCache )
{
@@ -425,7 +425,7 @@ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
//------------------------------------------------------------------------
static inline void typelib_typedescription_initTables(
typelib_TypeDescription * pTD )
SAL_THROW( () )
SAL_THROW(())
{
typelib_InterfaceTypeDescription * pITD = (typelib_InterfaceTypeDescription *)pTD;
@@ -1467,7 +1467,7 @@ void deleteExceptions(
// frees anything except typelib_TypeDescription base!
static inline void typelib_typedescription_destructExtendedMembers(
typelib_TypeDescription * pTD )
SAL_THROW( () )
SAL_THROW(())
{
OSL_ASSERT( typelib_TypeClass_TYPEDEF != pTD->eTypeClass );
@@ -1810,7 +1810,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_register(
//------------------------------------------------------------------------
static inline sal_Bool type_equals(
typelib_TypeDescriptionReference * p1, typelib_TypeDescriptionReference * p2 )
SAL_THROW( () )
SAL_THROW(())
{
return (p1 == p2 ||
(p1->eTypeClass == p2->eTypeClass &&

10
cppu/source/uno/assign.hxx
View File

@@ -46,7 +46,7 @@ namespace cppu
inline void _assignInterface(
void ** ppDest, void * pSource,
uno_AcquireFunc acquire, uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
_acquire( pSource, acquire );
void * const pToBeReleased = *ppDest;
@@ -58,7 +58,7 @@ inline void * _queryInterface(
void * pSource,
typelib_TypeDescriptionReference * pDestType,
uno_QueryInterfaceFunc queryInterface )
SAL_THROW( () )
SAL_THROW(())
{
if (pSource)
{
@@ -73,13 +73,13 @@ sal_Bool assignStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
SAL_THROW( () );
SAL_THROW(());
//--------------------------------------------------------------------------------------------------
inline sal_Bool _assignStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
if (pTypeDescr->pBaseTypeDescription)
{
@@ -237,7 +237,7 @@ inline sal_Bool _assignData(
void * pSource,
typelib_TypeDescriptionReference * pSourceType, typelib_TypeDescription * pSourceTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
if (pDest == pSource)
return _type_equals( pDestType, pSourceType );

8
cppu/source/uno/constr.hxx
View File

@@ -42,7 +42,7 @@ namespace cppu
inline void _defaultConstructUnion(
void * pMem,
typelib_TypeDescription * pTypeDescr )
SAL_THROW( () )
SAL_THROW(())
{
::uno_type_constructData(
(char *)pMem + ((typelib_UnionTypeDescription *)pTypeDescr)->nValueOffset,
@@ -53,12 +53,12 @@ inline void _defaultConstructUnion(
void defaultConstructStruct(
void * pMem,
typelib_CompoundTypeDescription * pCompType )
SAL_THROW( () );
SAL_THROW(());
//--------------------------------------------------------------------------------------------------
inline void _defaultConstructStruct(
void * pMem,
typelib_CompoundTypeDescription * pTypeDescr )
SAL_THROW( () )
SAL_THROW(())
{
if (pTypeDescr->pBaseTypeDescription)
{
@@ -161,7 +161,7 @@ inline void _defaultConstructData(
void * pMem,
typelib_TypeDescriptionReference * pType,
typelib_TypeDescription * pTypeDescr )
SAL_THROW( () )
SAL_THROW(())
{
switch (pType->eTypeClass)
{

12
cppu/source/uno/copy.hxx
View File

@@ -64,13 +64,13 @@ void copyConstructStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
SAL_THROW ( () );
SAL_THROW (());
//--------------------------------------------------------------------------------------------------
inline void _copyConstructStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
SAL_THROW ( () )
SAL_THROW (())
{
if (pTypeDescr->pBaseTypeDescription)
{
@@ -143,7 +143,7 @@ inline void _copyConstructUnion(
void * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
SAL_THROW ( () )
SAL_THROW (())
{
typelib_TypeDescriptionReference * pSetType = _unionGetSetType( pSource, pTypeDescr );
if (mapping)
@@ -175,7 +175,7 @@ inline void _copyConstructAnyFromData(
uno_Any * pDestAny, void * pSource,
typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
SAL_THROW ( () )
SAL_THROW (())
{
TYPE_ACQUIRE( pType );
pDestAny->pType = pType;
@@ -339,7 +339,7 @@ inline void _copyConstructAny(
uno_Any * pDestAny, void * pSource,
typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
SAL_THROW ( () )
SAL_THROW (())
{
if (typelib_TypeClass_VOID == pType->eTypeClass)
{
@@ -718,7 +718,7 @@ inline void _copyConstructData(
void * pDest, void * pSource,
typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
SAL_THROW ( () )
SAL_THROW (())
{
switch (pType->eTypeClass)
{

12
cppu/source/uno/data.cxx
View File

@@ -127,7 +127,7 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p
void defaultConstructStruct(
void * pMem,
typelib_CompoundTypeDescription * pCompType )
SAL_THROW( () )
SAL_THROW(())
{
_defaultConstructStruct( pMem, pCompType );
}
@@ -136,7 +136,7 @@ void copyConstructStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
SAL_THROW( () )
SAL_THROW(())
{
_copyConstructStruct( pDest, pSource, pTypeDescr, acquire, mapping );
}
@@ -145,7 +145,7 @@ void destructStruct(
void * pValue,
typelib_CompoundTypeDescription * pTypeDescr,
uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
_destructStruct( pValue, pTypeDescr, release );
}
@@ -154,7 +154,7 @@ sal_Bool equalStruct(
void * pDest, void *pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
return _equalStruct( pDest, pSource, pTypeDescr, queryInterface, release );
}
@@ -163,7 +163,7 @@ sal_Bool assignStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
return _assignStruct( pDest, pSource, pTypeDescr, queryInterface, acquire, release );
}
@@ -192,7 +192,7 @@ sal_Bool equalSequence(
uno_Sequence * pDest, uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
return _equalSequence( pDest, pSource, pElementType, queryInterface, release );
}

12
cppu/source/uno/destr.hxx
View File

@@ -43,7 +43,7 @@ inline void _destructUnion(
void * pValue,
typelib_TypeDescription * pTypeDescr,
uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
typelib_TypeDescriptionReference * pType = _unionGetSetType( pValue, pTypeDescr );
::uno_type_destructData(
@@ -56,13 +56,13 @@ void destructStruct(
void * pValue,
typelib_CompoundTypeDescription * pTypeDescr,
uno_ReleaseFunc release )
SAL_THROW( () );
SAL_THROW(());
//--------------------------------------------------------------------------------------------------
inline void _destructStruct(
void * pValue,
typelib_CompoundTypeDescription * pTypeDescr,
uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
if (pTypeDescr->pBaseTypeDescription)
{
@@ -114,7 +114,7 @@ void destructSequence(
inline void _destructAny(
uno_Any * pAny,
uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
typelib_TypeDescriptionReference * pType = pAny->pType;
@@ -196,7 +196,7 @@ inline sal_Int32 idestructElements(
void * pElements, typelib_TypeDescriptionReference * pElementType,
sal_Int32 nStartIndex, sal_Int32 nStopIndex,
uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
switch (pElementType->eTypeClass)
{
@@ -367,7 +367,7 @@ inline void _destructData(
typelib_TypeDescriptionReference * pType,
typelib_TypeDescription * pTypeDescr,
uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
switch (pType->eTypeClass)
{

12
cppu/source/uno/eq.hxx
View File

@@ -46,7 +46,7 @@ namespace cppu
inline sal_Bool _equalObject(
void * pI1, void * pI2,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
if (pI1 == pI2)
return sal_True;
@@ -77,13 +77,13 @@ sal_Bool equalStruct(
void * pDest, void *pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
SAL_THROW( () );
SAL_THROW(());
//--------------------------------------------------------------------------------------------------
inline sal_Bool _equalStruct(
void * pDest, void *pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
if (pTypeDescr->pBaseTypeDescription &&
!equalStruct( pDest, pSource, pTypeDescr->pBaseTypeDescription, queryInterface, release ))
@@ -114,13 +114,13 @@ sal_Bool equalSequence(
uno_Sequence * pDest, uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
SAL_THROW( () );
SAL_THROW(());
//--------------------------------------------------------------------------------------------------
inline sal_Bool _equalSequence(
uno_Sequence * pDest, uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
if (pDest == pSource)
return sal_True;
@@ -305,7 +305,7 @@ inline sal_Bool _equalData(
void * pSource,
typelib_TypeDescriptionReference * pSourceType,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
SAL_THROW( () )
SAL_THROW(())
{
typelib_TypeClass eSourceTypeClass, eDestTypeClass;
while (typelib_TypeClass_ANY == (eDestTypeClass = pDestType->eTypeClass))

58
cppu/source/uno/lbmap.cxx
View File

@@ -69,39 +69,39 @@ class Mapping
uno_Mapping * _pMapping;
public:
inline explicit Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW( () );
inline Mapping( const Mapping & rMapping ) SAL_THROW( () );
inline ~Mapping() SAL_THROW( () );
inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping ) SAL_THROW( () );
inline Mapping & SAL_CALL operator = ( const Mapping & rMapping ) SAL_THROW( () )
inline explicit Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW(());
inline Mapping( const Mapping & rMapping ) SAL_THROW(());
inline ~Mapping() SAL_THROW(());
inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping ) SAL_THROW(());
inline Mapping & SAL_CALL operator = ( const Mapping & rMapping ) SAL_THROW(())
{ return operator = ( rMapping._pMapping ); }
inline uno_Mapping * SAL_CALL get() const SAL_THROW( () )
inline uno_Mapping * SAL_CALL get() const SAL_THROW(())
{ return _pMapping; }
inline sal_Bool SAL_CALL is() const SAL_THROW( () )
inline sal_Bool SAL_CALL is() const SAL_THROW(())
{ return (_pMapping != 0); }
};
//__________________________________________________________________________________________________
inline Mapping::Mapping( uno_Mapping * pMapping ) SAL_THROW( () )
inline Mapping::Mapping( uno_Mapping * pMapping ) SAL_THROW(())
: _pMapping( pMapping )
{
if (_pMapping)
(*_pMapping->acquire)( _pMapping );
}
//__________________________________________________________________________________________________
inline Mapping::Mapping( const Mapping & rMapping ) SAL_THROW( () )
inline Mapping::Mapping( const Mapping & rMapping ) SAL_THROW(())
: _pMapping( rMapping._pMapping )
{
if (_pMapping)
(*_pMapping->acquire)( _pMapping );
}
//__________________________________________________________________________________________________
inline Mapping::~Mapping() SAL_THROW( () )
inline Mapping::~Mapping() SAL_THROW(())
{
if (_pMapping)
(*_pMapping->release)( _pMapping );
}
//__________________________________________________________________________________________________
inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW( () )
inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW(())
{
if (pMapping)
(*pMapping->acquire)( pMapping );
@@ -122,7 +122,7 @@ struct MappingEntry
MappingEntry(
uno_Mapping * pMapping_, uno_freeMappingFunc freeMapping_,
const OUString & rMappingName_ )
SAL_THROW( () )
SAL_THROW(())
: nRef( 1 )
, pMapping( pMapping_ )
, freeMapping( freeMapping_ )
@@ -132,13 +132,13 @@ struct MappingEntry
//--------------------------------------------------------------------------------------------------
struct FctOUStringHash : public std::unary_function< const OUString &, size_t >
{
size_t operator()( const OUString & rKey ) const SAL_THROW( () )
size_t operator()( const OUString & rKey ) const SAL_THROW(())
{ return (size_t)rKey.hashCode(); }
};
//--------------------------------------------------------------------------------------------------
struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t >
{
size_t operator()( uno_Mapping * pKey ) const SAL_THROW( () )
size_t operator()( uno_Mapping * pKey ) const SAL_THROW(())
{ return (size_t)pKey; }
};
@@ -164,7 +164,7 @@ struct MappingsData
t_OUStringSet aNegativeLibs;
};
//--------------------------------------------------------------------------------------------------
static MappingsData & getMappingsData() SAL_THROW( () )
static MappingsData & getMappingsData() SAL_THROW(())
{
static MappingsData * s_p = 0;
if (! s_p)
@@ -200,19 +200,19 @@ struct uno_Mediate_Mapping : public uno_Mapping
const Environment & rFrom_, const Environment & rTo_,
const Mapping & rFrom2Uno_, const Mapping & rUno2To_,
const OUString & rAddPurpose )
SAL_THROW( () );
SAL_THROW(());
};
extern "C"
{
//--------------------------------------------------------------------------------------------------
static void SAL_CALL mediate_free( uno_Mapping * pMapping )
SAL_THROW( () )
SAL_THROW(())
{
delete static_cast< uno_Mediate_Mapping * >( pMapping );
}
//--------------------------------------------------------------------------------------------------
static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
SAL_THROW( () )
SAL_THROW(())
{
if (1 == ::osl_incrementInterlockedCount(
& static_cast< uno_Mediate_Mapping * >( pMapping )->nRef ))
@@ -226,7 +226,7 @@ static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
}
//--------------------------------------------------------------------------------------------------
static void SAL_CALL mediate_release( uno_Mapping * pMapping )
SAL_THROW( () )
SAL_THROW(())
{
if (! ::osl_decrementInterlockedCount(
& static_cast< uno_Mediate_Mapping * >( pMapping )->nRef ))
@@ -239,7 +239,7 @@ static void SAL_CALL mediate_mapInterface(
uno_Mapping * pMapping,
void ** ppOut, void * pInterface,
typelib_InterfaceTypeDescription * pInterfaceTypeDescr )
SAL_THROW( () )
SAL_THROW(())
{
OSL_ENSURE( pMapping && ppOut, "### null ptr!" );
if (pMapping && ppOut)
@@ -275,7 +275,7 @@ uno_Mediate_Mapping::uno_Mediate_Mapping(
const Environment & rFrom_, const Environment & rTo_,
const Mapping & rFrom2Uno_, const Mapping & rUno2To_,
const OUString & rAddPurpose_ )
SAL_THROW( () )
SAL_THROW(())
: nRef( 1 )
, aFrom( rFrom_ )
, aTo( rTo_ )
@@ -291,7 +291,7 @@ uno_Mediate_Mapping::uno_Mediate_Mapping(
//==================================================================================================
static inline OUString getMappingName(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose )
SAL_THROW( () )
SAL_THROW(())
{
OUStringBuffer aKey( 64 );
aKey.append( rAddPurpose );
@@ -309,7 +309,7 @@ static inline OUString getMappingName(
//==================================================================================================
static inline OUString getBridgeName(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose )
SAL_THROW( () )
SAL_THROW(())
{
OUStringBuffer aBridgeName( 16 );
if (!rAddPurpose.isEmpty())
@@ -324,7 +324,7 @@ static inline OUString getBridgeName(
}
//==================================================================================================
static inline void setNegativeBridge( const OUString & rBridgeName )
SAL_THROW( () )
SAL_THROW(())
{
MappingsData & rData = getMappingsData();
MutexGuard aGuard( rData.aNegativeLibsMutex );
@@ -332,7 +332,7 @@ static inline void setNegativeBridge( const OUString & rBridgeName )
}
//==================================================================================================
static inline oslModule loadModule( const OUString & rBridgeName )
SAL_THROW( () )
SAL_THROW(())
{
sal_Bool bNeg;
{
@@ -356,7 +356,7 @@ static inline oslModule loadModule( const OUString & rBridgeName )
//==================================================================================================
static Mapping loadExternalMapping(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose )
SAL_THROW( () )
SAL_THROW(())
{
OSL_ASSERT( rFrom.is() && rTo.is() );
if (rFrom.is() && rTo.is())
@@ -400,7 +400,7 @@ static Mapping loadExternalMapping(
//==================================================================================================
static Mapping getDirectMapping(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose = OUString() )
SAL_THROW( () )
SAL_THROW(())
{
OSL_ASSERT( rFrom.is() && rTo.is() );
if (rFrom.is() && rTo.is())
@@ -430,7 +430,7 @@ static inline Mapping createMediateMapping(
const Environment & rFrom, const Environment & rTo,
const Mapping & rFrom2Uno, const Mapping & rUno2To,
const OUString & rAddPurpose )
SAL_THROW( () )
SAL_THROW(())
{
uno_Mapping * pRet = new uno_Mediate_Mapping(
rFrom, rTo, rFrom2Uno, rUno2To, rAddPurpose ); // ref count initially 1
@@ -443,7 +443,7 @@ static inline Mapping createMediateMapping(
//==================================================================================================
static Mapping getMediateMapping(
const Environment & rFrom, const Environment & rTo, const OUString & rAddPurpose )
SAL_THROW( () )
SAL_THROW(())
{
Environment aUno;
Mapping aUno2To;

14
cppu/source/uno/prim.hxx
View File

@@ -58,7 +58,7 @@ inline void * _map(
void * p,
typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,
uno_Mapping * mapping )
SAL_THROW( () )
SAL_THROW(())
{
void * pRet = 0;
if (p)
@@ -79,7 +79,7 @@ inline void * _map(
return pRet;
}
//--------------------------------------------------------------------------------------------------
inline void _acquire( void * p, uno_AcquireFunc acquire ) SAL_THROW( () )
inline void _acquire( void * p, uno_AcquireFunc acquire ) SAL_THROW(())
{
if (p)
{
@@ -94,7 +94,7 @@ inline void _acquire( void * p, uno_AcquireFunc acquire ) SAL_THROW( () )
}
}
//--------------------------------------------------------------------------------------------------
inline void _release( void * p, uno_ReleaseFunc release ) SAL_THROW( () )
inline void _release( void * p, uno_ReleaseFunc release ) SAL_THROW(())
{
if (p)
{
@@ -123,14 +123,14 @@ inline sal_uInt32 calcSeqMemSize(
}
//--------------------------------------------------------------------------------------------------
inline uno_Sequence * createEmptySequence() SAL_THROW( () )
inline uno_Sequence * createEmptySequence() SAL_THROW(())
{
::osl_incrementInterlockedCount( &g_emptySeq.nRefCount );
return &g_emptySeq;
}
//--------------------------------------------------------------------------------------------------
inline typelib_TypeDescriptionReference * _getVoidType()
SAL_THROW( () )
SAL_THROW(())
{
if (! g_pVoidType)
{
@@ -162,7 +162,7 @@ extern "C" void * binuno_queryInterface(
//--------------------------------------------------------------------------------------------------
inline typelib_TypeDescriptionReference * _unionGetSetType(
void * pUnion, typelib_TypeDescription * pTD )
SAL_THROW( () )
SAL_THROW(())
{
typelib_TypeDescriptionReference * pRet = 0;
sal_Int32 nPos;
@@ -188,7 +188,7 @@ inline typelib_TypeDescriptionReference * _unionGetSetType(
//--------------------------------------------------------------------------------------------------
inline sal_Bool _type_equals(
typelib_TypeDescriptionReference * pType1, typelib_TypeDescriptionReference * pType2 )
SAL_THROW( () )
SAL_THROW(())
{
return (pType1 == pType2 ||
(pType1->eTypeClass == pType2->eTypeClass &&