diff options
author | Alexander Bergmann <myaddons@gmx.de> | 2012-01-26 16:00:09 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-01-26 17:41:07 +0000 |
commit | 0439af27e1f37b19d4409f34f974d6ade49f99bf (patch) | |
tree | 13bbb2549319d74a1a109bf2727aab37dca5b8c7 /cppuhelper/source | |
parent | f1cb0a4ab4f11dc015be1696c7c7751802171915 (diff) |
Code cleanup: ( () ) replaced by (())
Diffstat (limited to 'cppuhelper/source')
-rw-r--r-- | cppuhelper/source/bootstrap.cxx | 6 | ||||
-rw-r--r-- | cppuhelper/source/component.cxx | 2 | ||||
-rw-r--r-- | cppuhelper/source/component_context.cxx | 8 | ||||
-rw-r--r-- | cppuhelper/source/factory.cxx | 28 | ||||
-rw-r--r-- | cppuhelper/source/implbase.cxx | 28 | ||||
-rw-r--r-- | cppuhelper/source/implbase_ex.cxx | 8 | ||||
-rw-r--r-- | cppuhelper/source/interfacecontainer.cxx | 62 | ||||
-rw-r--r-- | cppuhelper/source/macro_expander.cxx | 10 | ||||
-rw-r--r-- | cppuhelper/source/propshlp.cxx | 26 | ||||
-rw-r--r-- | cppuhelper/source/servicefactory.cxx | 8 | ||||
-rw-r--r-- | cppuhelper/source/shlib.cxx | 6 | ||||
-rw-r--r-- | cppuhelper/source/tdmgr.cxx | 4 | ||||
-rw-r--r-- | cppuhelper/source/typeprovider.cxx | 30 | ||||
-rw-r--r-- | cppuhelper/source/weak.cxx | 34 |
14 files changed, 130 insertions, 130 deletions
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index 063bece4d8a0..39e44feda2e5 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.cxx @@ -93,7 +93,7 @@ OUString const & get_this_libpath() return s_path; } -Bootstrap const & get_unorc() SAL_THROW( () ) +Bootstrap const & get_unorc() SAL_THROW(()) { static rtlBootstrapHandle s_bstrap = 0; if (! s_bstrap) @@ -142,7 +142,7 @@ Reference< XComponentContext > bootstrapInitialContext( Reference< XComponentContext > SAL_CALL createInitialCfgComponentContext( ContextEntry_Init const * pEntries, sal_Int32 nEntries, Reference< XComponentContext > const & xDelegate ) - SAL_THROW( () ); + SAL_THROW(()); Reference< registry::XSimpleRegistry > SAL_CALL createRegistryWrapper( const Reference< XComponentContext >& xContext ); @@ -152,7 +152,7 @@ namespace { template< class T > inline beans::PropertyValue createPropertyValue( OUString const & name, T const & value ) - SAL_THROW( () ) + SAL_THROW(()) { return beans::PropertyValue( name, -1, makeAny( value ), beans::PropertyState_DIRECT_VALUE ); diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx index a4e797706199..1cc7c2fdd79b 100644 --- a/cppuhelper/source/component.cxx +++ b/cppuhelper/source/component.cxx @@ -49,7 +49,7 @@ namespace cppu // class OComponentHelper // ---------------------------------------------------- -OComponentHelper::OComponentHelper( Mutex & rMutex ) SAL_THROW( () ) +OComponentHelper::OComponentHelper( Mutex & rMutex ) SAL_THROW(()) : rBHelper( rMutex ) { } diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index da60e39152b7..6c795dec88cc 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -302,7 +302,7 @@ class DisposingForwarder Reference< lang::XComponent > m_xTarget; inline DisposingForwarder( Reference< lang::XComponent > const & xTarget ) - SAL_THROW( () ) + SAL_THROW(()) : m_xTarget( xTarget ) { OSL_ASSERT( m_xTarget.is() ); } public: @@ -375,7 +375,7 @@ public: ContextEntry_Init const * pEntries, sal_Int32 nEntries, Reference< XComponentContext > const & xDelegate ); virtual ~ComponentContext() - SAL_THROW( () ); + SAL_THROW(()); // XComponentContext virtual Any SAL_CALL getValueByName( OUString const & rName ) @@ -676,7 +676,7 @@ Reference< lang::XMultiComponentFactory > ComponentContext::getServiceManager() } //__________________________________________________________________________________________________ ComponentContext::~ComponentContext() - SAL_THROW( () ) + SAL_THROW(()) { #ifdef CONTEXT_DIAG ::fprintf( stderr, "> destructed context %p\n", this ); @@ -865,7 +865,7 @@ extern "C" { static void s_createComponentContext_v(va_list * pParam) Reference< XComponentContext > SAL_CALL createComponentContext( ContextEntry_Init const * pEntries, sal_Int32 nEntries, Reference< XComponentContext > const & xDelegate ) - SAL_THROW( () ) + SAL_THROW(()) { uno::Environment curr_env(Environment::getCurrent()); uno::Environment source_env(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV)))); diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 4a298d1cb188..dc46aa8a09f5 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -80,7 +80,7 @@ public: ComponentInstantiation pCreateFunction_, ComponentFactoryFunc fptr, const Sequence< OUString > * pServiceNames_ ) - SAL_THROW( () ) + SAL_THROW(()) : xSMgr( rServiceManager ) , pCreateFunction( pCreateFunction_ ) , m_fptr( fptr ) @@ -94,7 +94,7 @@ public: OSingleFactoryHelper( const Reference<XMultiServiceFactory > & rServiceManager, const OUString & rImplementationName_ ) - SAL_THROW( () ) + SAL_THROW(()) : xSMgr( rServiceManager ) , pCreateFunction( NULL ) , m_fptr( 0 ) @@ -292,7 +292,7 @@ public: ComponentFactoryFunc fptr, const Sequence< OUString > * pServiceNames_, sal_Bool bOneInstance_ = sal_False ) - SAL_THROW( () ) + SAL_THROW(()) : OComponentHelper( aMutex ) , OSingleFactoryHelper( rServiceManager, rImplementationName_, pCreateFunction_, fptr, pServiceNames_ ) , bOneInstance( bOneInstance_ ) @@ -310,7 +310,7 @@ public: const Sequence< OUString > * pServiceNames_, rtl_ModuleCount * pModCount, sal_Bool bOneInstance_ = sal_False ) - SAL_THROW( () ) + SAL_THROW(()) : OComponentHelper( aMutex ) , OSingleFactoryHelper( rServiceManager, rImplementationName_, pCreateFunction_, fptr, pServiceNames_ ) , bOneInstance( bOneInstance_ ) @@ -325,7 +325,7 @@ public: const Reference<XMultiServiceFactory > & rServiceManager, const OUString & rImplementationName_, sal_Bool bOneInstance_ = sal_False ) - SAL_THROW( () ) + SAL_THROW(()) : OComponentHelper( aMutex ) , OSingleFactoryHelper( rServiceManager, rImplementationName_ ) , bOneInstance( bOneInstance_ ) @@ -551,7 +551,7 @@ public: const Reference<XMultiServiceFactory > & rServiceManager, const OUString & rImplementationName_, const Reference<XRegistryKey > & xImplementationKey_, - sal_Bool bOneInstance_ = sal_False ) SAL_THROW( () ) + sal_Bool bOneInstance_ = sal_False ) SAL_THROW(()) : OFactoryComponentHelper( rServiceManager, rImplementationName_, 0, 0, 0, bOneInstance_ ), OPropertySetHelper( OComponentHelper::rBHelper ), @@ -957,7 +957,7 @@ class OFactoryProxyHelper : public WeakImplHelper3< XServiceInfo, XSingleService public: OFactoryProxyHelper( const Reference<XSingleServiceFactory > & rFactory ) - SAL_THROW( () ) + SAL_THROW(()) : xFactory( rFactory ) {} @@ -1043,7 +1043,7 @@ Reference<XSingleServiceFactory > SAL_CALL createSingleFactory( ComponentInstantiation pCreateFunction, const Sequence< OUString > & rServiceNames, rtl_ModuleCount *pModCount ) - SAL_THROW( () ) + SAL_THROW(()) { return new OFactoryComponentHelper( rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, pModCount, sal_False ); @@ -1053,7 +1053,7 @@ Reference<XSingleServiceFactory > SAL_CALL createSingleFactory( Reference<XSingleServiceFactory > SAL_CALL createFactoryProxy( SAL_UNUSED_PARAMETER const Reference<XMultiServiceFactory > &, const Reference<XSingleServiceFactory > & rFactory ) - SAL_THROW( () ) + SAL_THROW(()) { return new OFactoryProxyHelper( rFactory ); } @@ -1065,7 +1065,7 @@ Reference<XSingleServiceFactory > SAL_CALL createOneInstanceFactory( ComponentInstantiation pCreateFunction, const Sequence< OUString > & rServiceNames, rtl_ModuleCount *pModCount ) - SAL_THROW( () ) + SAL_THROW(()) { return new OFactoryComponentHelper( rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, pModCount, sal_True ); @@ -1076,7 +1076,7 @@ Reference<XSingleServiceFactory > SAL_CALL createSingleRegistryFactory( const Reference<XMultiServiceFactory > & rServiceManager, const OUString & rImplementationName, const Reference<XRegistryKey > & rImplementationKey ) - SAL_THROW( () ) + SAL_THROW(()) { return new ORegistryFactoryHelper( rServiceManager, rImplementationName, rImplementationKey, sal_False ); @@ -1087,7 +1087,7 @@ Reference<XSingleServiceFactory > SAL_CALL createOneInstanceRegistryFactory( const Reference<XMultiServiceFactory > & rServiceManager, const OUString & rImplementationName, const Reference<XRegistryKey > & rImplementationKey ) - SAL_THROW( () ) + SAL_THROW(()) { return new ORegistryFactoryHelper( rServiceManager, rImplementationName, rImplementationKey, sal_True ); @@ -1099,7 +1099,7 @@ Reference< lang::XSingleComponentFactory > SAL_CALL createSingleComponentFactory OUString const & rImplementationName, Sequence< OUString > const & rServiceNames, rtl_ModuleCount * pModCount) - SAL_THROW( () ) + SAL_THROW(()) { return new OFactoryComponentHelper( Reference< XMultiServiceFactory >(), rImplementationName, 0, fptr, &rServiceNames, pModCount, sal_False ); @@ -1110,7 +1110,7 @@ Reference< lang::XSingleComponentFactory > SAL_CALL createOneInstanceComponentFa OUString const & rImplementationName, Sequence< OUString > const & rServiceNames, rtl_ModuleCount * pModCount) - SAL_THROW( () ) + SAL_THROW(()) { return new OFactoryComponentHelper( Reference< XMultiServiceFactory >(), rImplementationName, 0, fptr, &rServiceNames, pModCount, sal_True ); diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx index 4738870b69e5..fbe7ed69b79c 100644 --- a/cppuhelper/source/implbase.cxx +++ b/cppuhelper/source/implbase.cxx @@ -48,14 +48,14 @@ namespace namespace cppu { //================================================================================================== -Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW( () ) +Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW(()) { return theImplHelperInitMutex::get(); } // ClassDataBase //__________________________________________________________________________________________________ -ClassDataBase::ClassDataBase() SAL_THROW( () ) +ClassDataBase::ClassDataBase() SAL_THROW(()) : bOffsetsInit( sal_False ) , nType2Offset( 0 ) , nClassCode( 0 ) @@ -64,7 +64,7 @@ ClassDataBase::ClassDataBase() SAL_THROW( () ) { } //__________________________________________________________________________________________________ -ClassDataBase::ClassDataBase( sal_Int32 nClassCode_ ) SAL_THROW( () ) +ClassDataBase::ClassDataBase( sal_Int32 nClassCode_ ) SAL_THROW(()) : bOffsetsInit( sal_False ) , nType2Offset( 0 ) , nClassCode( nClassCode_ ) @@ -73,7 +73,7 @@ ClassDataBase::ClassDataBase( sal_Int32 nClassCode_ ) SAL_THROW( () ) { } //__________________________________________________________________________________________________ -ClassDataBase::~ClassDataBase() SAL_THROW( () ) +ClassDataBase::~ClassDataBase() SAL_THROW(()) { delete pTypes; delete pId; @@ -87,7 +87,7 @@ ClassDataBase::~ClassDataBase() SAL_THROW( () ) // ClassData //__________________________________________________________________________________________________ -void ClassData::writeTypeOffset( const Type & rType, sal_Int32 nOffset ) SAL_THROW( () ) +void ClassData::writeTypeOffset( const Type & rType, sal_Int32 nOffset ) SAL_THROW(()) { arType2Offset[nType2Offset].nOffset = nOffset; @@ -107,7 +107,7 @@ void ClassData::writeTypeOffset( const Type & rType, sal_Int32 nOffset ) SAL_THR #endif } //__________________________________________________________________________________________________ -void ClassData::initTypeProvider() SAL_THROW( () ) +void ClassData::initTypeProvider() SAL_THROW(()) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if (! pTypes) @@ -148,14 +148,14 @@ void ClassData::initTypeProvider() SAL_THROW( () ) } } //__________________________________________________________________________________________________ -Sequence< Type > ClassData::getTypes() SAL_THROW( () ) +Sequence< Type > ClassData::getTypes() SAL_THROW(()) { if (! pTypes) initTypeProvider(); return *pTypes; } //__________________________________________________________________________________________________ -Sequence< sal_Int8 > ClassData::getImplementationId() SAL_THROW( () ) +Sequence< sal_Int8 > ClassData::getImplementationId() SAL_THROW(()) { if (! pTypes) initTypeProvider(); @@ -165,14 +165,14 @@ Sequence< sal_Int8 > ClassData::getImplementationId() SAL_THROW( () ) //-------------------------------------------------------------------------------------------------- static inline sal_Bool td_equals( typelib_TypeDescription * pTD, typelib_TypeDescriptionReference * pType ) - SAL_THROW( () ) + SAL_THROW(()) { return (pTD->pWeakRef == pType || (pTD->pTypeName->length == pType->pTypeName->length && rtl_ustr_compare( pTD->pTypeName->buffer, pType->pTypeName->buffer ) == 0)); } //__________________________________________________________________________________________________ -Any ClassData::query( const Type & rType, lang::XTypeProvider * pBase ) SAL_THROW( () ) +Any ClassData::query( const Type & rType, lang::XTypeProvider * pBase ) SAL_THROW(()) { if (rType == ::getCppuType( (const Reference< XInterface > *)0 )) return Any( &pBase, ::getCppuType( (const Reference< XInterface > *)0 ) ); @@ -204,13 +204,13 @@ Any ClassData::query( const Type & rType, lang::XTypeProvider * pBase ) SAL_THRO // WeakComponentImplHelperBase //__________________________________________________________________________________________________ WeakComponentImplHelperBase::WeakComponentImplHelperBase( Mutex & rMutex ) - SAL_THROW( () ) + SAL_THROW(()) : rBHelper( rMutex ) { } //__________________________________________________________________________________________________ WeakComponentImplHelperBase::~WeakComponentImplHelperBase() - SAL_THROW( () ) + SAL_THROW(()) { } //__________________________________________________________________________________________________ @@ -330,13 +330,13 @@ void WeakComponentImplHelperBase::removeEventListener( // WeakAggComponentImplHelperBase //__________________________________________________________________________________________________ WeakAggComponentImplHelperBase::WeakAggComponentImplHelperBase( Mutex & rMutex ) - SAL_THROW( () ) + SAL_THROW(()) : rBHelper( rMutex ) { } //__________________________________________________________________________________________________ WeakAggComponentImplHelperBase::~WeakAggComponentImplHelperBase() - SAL_THROW( () ) + SAL_THROW(()) { } //__________________________________________________________________________________________________ diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx index 720ab0d35479..2e5e9523eb3a 100644 --- a/cppuhelper/source/implbase_ex.cxx +++ b/cppuhelper/source/implbase_ex.cxx @@ -49,7 +49,7 @@ namespace cppu /** Shared mutex for implementation helper initialization. Not for public use. */ -::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW( () ); +::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW(()); //-------------------------------------------------------------------------------------------------- static inline void checkInterface( Type const & rType ) @@ -70,12 +70,12 @@ static inline void checkInterface( Type const & rType ) } } //-------------------------------------------------------------------------------------------------- -static inline bool isXInterface( rtl_uString * pStr ) SAL_THROW( () ) +static inline bool isXInterface( rtl_uString * pStr ) SAL_THROW(()) { return (((OUString const *)&pStr)->equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ) != sal_False); } //-------------------------------------------------------------------------------------------------- -static inline void * makeInterface( sal_IntPtr nOffset, void * that ) SAL_THROW( () ) +static inline void * makeInterface( sal_IntPtr nOffset, void * that ) SAL_THROW(()) { return (((char *)that) + nOffset); } @@ -83,7 +83,7 @@ static inline void * makeInterface( sal_IntPtr nOffset, void * that ) SAL_THROW( static inline bool __td_equals( typelib_TypeDescriptionReference const * pTDR1, typelib_TypeDescriptionReference const * pTDR2 ) - SAL_THROW( () ) + SAL_THROW(()) { return ((pTDR1 == pTDR2) || ((OUString const *)&pTDR1->pTypeName)->equals( *(OUString const *)&pTDR2->pTypeName ) != sal_False); diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx index 58150c47fa3e..510d25f35c20 100644 --- a/cppuhelper/source/interfacecontainer.cxx +++ b/cppuhelper/source/interfacecontainer.cxx @@ -49,7 +49,7 @@ namespace cppu * Reallocate the sequence. */ static void realloc( Sequence< Reference< XInterface > > & rSeq, sal_Int32 nNewLen ) - SAL_THROW( () ) + SAL_THROW(()) { rSeq.realloc( nNewLen ); } @@ -58,7 +58,7 @@ static void realloc( Sequence< Reference< XInterface > > & rSeq, sal_Int32 nNewL * Remove an element from an interface sequence. */ static void sequenceRemoveElementAt( Sequence< Reference< XInterface > > & rSeq, sal_Int32 index ) - SAL_THROW( () ) + SAL_THROW(()) { sal_Int32 nNewLen = rSeq.getLength() - 1; @@ -79,7 +79,7 @@ static void sequenceRemoveElementAt( Sequence< Reference< XInterface > > & rSeq, #endif OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont_ ) - SAL_THROW( () ) + SAL_THROW(()) : rCont( rCont_ ) { MutexGuard aGuard( rCont.rMutex ); @@ -102,7 +102,7 @@ OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper & nRemain = 0; } -OInterfaceIteratorHelper::~OInterfaceIteratorHelper() SAL_THROW( () ) +OInterfaceIteratorHelper::~OInterfaceIteratorHelper() SAL_THROW(()) { sal_Bool bShared; { @@ -127,7 +127,7 @@ OInterfaceIteratorHelper::~OInterfaceIteratorHelper() SAL_THROW( () ) } } -XInterface * OInterfaceIteratorHelper::next() SAL_THROW( () ) +XInterface * OInterfaceIteratorHelper::next() SAL_THROW(()) { if( nRemain ) { @@ -142,7 +142,7 @@ XInterface * OInterfaceIteratorHelper::next() SAL_THROW( () ) return 0; } -void OInterfaceIteratorHelper::remove() SAL_THROW( () ) +void OInterfaceIteratorHelper::remove() SAL_THROW(()) { if( bIsList ) { @@ -158,14 +158,14 @@ void OInterfaceIteratorHelper::remove() SAL_THROW( () ) } } -OInterfaceContainerHelper::OInterfaceContainerHelper( Mutex & rMutex_ ) SAL_THROW( () ) +OInterfaceContainerHelper::OInterfaceContainerHelper( Mutex & rMutex_ ) SAL_THROW(()) : rMutex( rMutex_ ) , bInUse( sal_False ) , bIsList( sal_False ) { } -OInterfaceContainerHelper::~OInterfaceContainerHelper() SAL_THROW( () ) +OInterfaceContainerHelper::~OInterfaceContainerHelper() SAL_THROW(()) { OSL_ENSURE( !bInUse, "~OInterfaceContainerHelper but is in use" ); if( bIsList ) @@ -174,7 +174,7 @@ OInterfaceContainerHelper::~OInterfaceContainerHelper() SAL_THROW( () ) aData.pAsInterface->release(); } -sal_Int32 OInterfaceContainerHelper::getLength() const SAL_THROW( () ) +sal_Int32 OInterfaceContainerHelper::getLength() const SAL_THROW(()) { MutexGuard aGuard( rMutex ); if( bIsList ) @@ -184,7 +184,7 @@ sal_Int32 OInterfaceContainerHelper::getLength() const SAL_THROW( () ) return 0; } -Sequence< Reference<XInterface> > OInterfaceContainerHelper::getElements() const SAL_THROW( () ) +Sequence< Reference<XInterface> > OInterfaceContainerHelper::getElements() const SAL_THROW(()) { MutexGuard aGuard( rMutex ); if( bIsList ) @@ -197,7 +197,7 @@ Sequence< Reference<XInterface> > OInterfaceContainerHelper::getElements() const return Sequence< Reference< XInterface > >(); } -void OInterfaceContainerHelper::copyAndResetInUse() SAL_THROW( () ) +void OInterfaceContainerHelper::copyAndResetInUse() SAL_THROW(()) { OSL_ENSURE( bInUse, "OInterfaceContainerHelper not in use" ); if( bInUse ) @@ -213,7 +213,7 @@ void OInterfaceContainerHelper::copyAndResetInUse() SAL_THROW( () ) } } -sal_Int32 OInterfaceContainerHelper::addInterface( const Reference<XInterface> & rListener ) SAL_THROW( () ) +sal_Int32 OInterfaceContainerHelper::addInterface( const Reference<XInterface> & rListener ) SAL_THROW(()) { OSL_ASSERT( rListener.is() ); MutexGuard aGuard( rMutex ); @@ -247,7 +247,7 @@ sal_Int32 OInterfaceContainerHelper::addInterface( const Reference<XInterface> & } } -sal_Int32 OInterfaceContainerHelper::removeInterface( const Reference<XInterface> & rListener ) SAL_THROW( () ) +sal_Int32 OInterfaceContainerHelper::removeInterface( const Reference<XInterface> & rListener ) SAL_THROW(()) { OSL_ASSERT( rListener.is() ); MutexGuard aGuard( rMutex ); @@ -303,7 +303,7 @@ sal_Int32 OInterfaceContainerHelper::removeInterface( const Reference<XInterface return aData.pAsInterface ? 1 : 0; } -void OInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt ) SAL_THROW( () ) +void OInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt ) SAL_THROW(()) { ClearableMutexGuard aGuard( rMutex ); OInterfaceIteratorHelper aIt( *this ); @@ -333,7 +333,7 @@ void OInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt ) SAL_ } -void OInterfaceContainerHelper::clear() SAL_THROW( () ) +void OInterfaceContainerHelper::clear() SAL_THROW(()) { ClearableMutexGuard aGuard( rMutex ); OInterfaceIteratorHelper aIt( *this ); @@ -354,13 +354,13 @@ void OInterfaceContainerHelper::clear() SAL_THROW( () ) typedef ::std::vector< std::pair < Type , void* > > t_type2ptr; OMultiTypeInterfaceContainerHelper::OMultiTypeInterfaceContainerHelper( Mutex & rMutex_ ) - SAL_THROW( () ) + SAL_THROW(()) : rMutex( rMutex_ ) { m_pMap = new t_type2ptr(); } OMultiTypeInterfaceContainerHelper::~OMultiTypeInterfaceContainerHelper() - SAL_THROW( () ) + SAL_THROW(()) { t_type2ptr * pMap = (t_type2ptr *)m_pMap; t_type2ptr::iterator iter = pMap->begin(); @@ -375,7 +375,7 @@ OMultiTypeInterfaceContainerHelper::~OMultiTypeInterfaceContainerHelper() delete pMap; } Sequence< Type > OMultiTypeInterfaceContainerHelper::getContainedTypes() const - SAL_THROW( () ) + SAL_THROW(()) { t_type2ptr * pMap = (t_type2ptr *)m_pMap; t_type2ptr::size_type nSize; @@ -423,7 +423,7 @@ static t_type2ptr::iterator findType(t_type2ptr *pMap, const Type & rKey ) } OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelper::getContainer( const Type & rKey ) const - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); @@ -435,7 +435,7 @@ OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelper::getContainer( co } sal_Int32 OMultiTypeInterfaceContainerHelper::addInterface( const Type & rKey, const Reference< XInterface > & rListener ) - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); t_type2ptr * pMap = (t_type2ptr *)m_pMap; @@ -451,7 +451,7 @@ sal_Int32 OMultiTypeInterfaceContainerHelper::addInterface( } sal_Int32 OMultiTypeInterfaceContainerHelper::removeInterface( const Type & rKey, const Reference< XInterface > & rListener ) - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); @@ -466,7 +466,7 @@ sal_Int32 OMultiTypeInterfaceContainerHelper::removeInterface( return 0; } void OMultiTypeInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt ) - SAL_THROW( () ) + SAL_THROW(()) { t_type2ptr::size_type nSize = 0; OInterfaceContainerHelper ** ppListenerContainers = NULL; @@ -503,7 +503,7 @@ void OMultiTypeInterfaceContainerHelper::disposeAndClear( const EventObject & rE delete [] ppListenerContainers; } void OMultiTypeInterfaceContainerHelper::clear() - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); t_type2ptr * pMap = (t_type2ptr *)m_pMap; @@ -536,14 +536,14 @@ static t_long2ptr::iterator findLong(t_long2ptr *pMap, sal_Int32 nKey ) } OMultiTypeInterfaceContainerHelperInt32::OMultiTypeInterfaceContainerHelperInt32( Mutex & rMutex_ ) - SAL_THROW( () ) + SAL_THROW(()) : m_pMap( NULL ) , rMutex( rMutex_ ) { // delay pMap allocation until necessary. } OMultiTypeInterfaceContainerHelperInt32::~OMultiTypeInterfaceContainerHelperInt32() - SAL_THROW( () ) + SAL_THROW(()) { if (!m_pMap) return; @@ -561,7 +561,7 @@ OMultiTypeInterfaceContainerHelperInt32::~OMultiTypeInterfaceContainerHelperInt3 delete pMap; } Sequence< sal_Int32 > OMultiTypeInterfaceContainerHelperInt32::getContainedTypes() const - SAL_THROW( () ) + SAL_THROW(()) { t_long2ptr * pMap = (t_long2ptr *)m_pMap; t_long2ptr::size_type nSize; @@ -594,7 +594,7 @@ Sequence< sal_Int32 > OMultiTypeInterfaceContainerHelperInt32::getContainedTypes return ::com::sun::star::uno::Sequence< sal_Int32 >(); } OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperInt32::getContainer( const sal_Int32 & rKey ) const - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); @@ -608,7 +608,7 @@ OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperInt32::getContaine } sal_Int32 OMultiTypeInterfaceContainerHelperInt32::addInterface( const sal_Int32 & rKey, const Reference< XInterface > & rListener ) - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); if (!m_pMap) @@ -626,7 +626,7 @@ sal_Int32 OMultiTypeInterfaceContainerHelperInt32::addInterface( } sal_Int32 OMultiTypeInterfaceContainerHelperInt32::removeInterface( const sal_Int32 & rKey, const Reference< XInterface > & rListener ) - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); @@ -643,7 +643,7 @@ sal_Int32 OMultiTypeInterfaceContainerHelperInt32::removeInterface( return 0; } void OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject & rEvt ) - SAL_THROW( () ) + SAL_THROW(()) { t_long2ptr::size_type nSize = 0; OInterfaceContainerHelper ** ppListenerContainers = NULL; @@ -682,7 +682,7 @@ void OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject delete [] ppListenerContainers; } void OMultiTypeInterfaceContainerHelperInt32::clear() - SAL_THROW( () ) + SAL_THROW(()) { ::osl::MutexGuard aGuard( rMutex ); if (!m_pMap) diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 431e24c76c01..eab09c55ab16 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star::uno; namespace cppu { //---- private forward ----------------------------------------------------------------------------- -Bootstrap const & get_unorc() SAL_THROW( () ); +Bootstrap const & get_unorc() SAL_THROW(()); } namespace cppuhelper { namespace detail { @@ -111,11 +111,11 @@ protected: virtual void SAL_CALL disposing(); public: - inline Bootstrap_MacroExpander() SAL_THROW( () ) + inline Bootstrap_MacroExpander() SAL_THROW(()) : t_uno_impl( m_mutex ) {} virtual ~Bootstrap_MacroExpander() - SAL_THROW( () ); + SAL_THROW(()); // XMacroExpander impl virtual OUString SAL_CALL expandMacros( OUString const & exp ) @@ -133,7 +133,7 @@ public: void Bootstrap_MacroExpander::disposing() {} //__________________________________________________________________________________________________ -Bootstrap_MacroExpander::~Bootstrap_MacroExpander() SAL_THROW( () ) +Bootstrap_MacroExpander::~Bootstrap_MacroExpander() SAL_THROW(()) {} // XServiceInfo impl @@ -185,7 +185,7 @@ namespace cppu { //################################################################################################## -Reference< lang::XSingleComponentFactory > create_boostrap_macro_expander_factory() SAL_THROW( () ) +Reference< lang::XSingleComponentFactory > create_boostrap_macro_expander_factory() SAL_THROW(()) { Reference< lang::XSingleComponentFactory > free(::cppu::createSingleComponentFactory( service_create, diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index 338d9c184b24..a66f185c303a 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -51,15 +51,15 @@ IPropertyArrayHelper::~IPropertyArrayHelper() { } -inline const ::com::sun::star::uno::Type & getPropertyTypeIdentifier( ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & getPropertyTypeIdentifier( ) SAL_THROW(()) { return ::getCppuType( (Reference< XPropertyChangeListener > *)0 ); } -inline const ::com::sun::star::uno::Type & getPropertiesTypeIdentifier() SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & getPropertiesTypeIdentifier() SAL_THROW(()) { return ::getCppuType( (Reference< XPropertiesChangeListener > *)0 ); } -inline const ::com::sun::star::uno::Type & getVetoableTypeIdentifier() SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & getVetoableTypeIdentifier() SAL_THROW(()) { return ::getCppuType( (Reference< XVetoableChangeListener > *)0 ); } @@ -84,7 +84,7 @@ class OPropertySetHelperInfo_Impl Sequence < Property > aInfos; public: - OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW( () ); + OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW(()); // XPropertySetInfo-Methoden virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException); @@ -98,7 +98,7 @@ public: */ OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) - SAL_THROW( () ) + SAL_THROW(()) :aInfos( rHelper_.getProperties() ) { } @@ -169,7 +169,7 @@ public: // class PropertySetHelper // ---------------------------------------------------- OPropertySetHelper::OPropertySetHelper( - OBroadcastHelper & rBHelper_ ) SAL_THROW( () ) + OBroadcastHelper & rBHelper_ ) SAL_THROW(()) : rBHelper( rBHelper_ ), aBoundLC( rBHelper_.rMutex ), aVetoableLC( rBHelper_.rMutex ), @@ -208,10 +208,10 @@ OPropertySetHelper2::OPropertySetHelper2( /** * You must call disposing before. */ -OPropertySetHelper::~OPropertySetHelper() SAL_THROW( () ) +OPropertySetHelper::~OPropertySetHelper() SAL_THROW(()) { } -OPropertySetHelper2::~OPropertySetHelper2() SAL_THROW( () ) +OPropertySetHelper2::~OPropertySetHelper2() SAL_THROW(()) { } @@ -251,7 +251,7 @@ Any OPropertySetHelper2::queryInterface( const ::com::sun::star::uno::Type & rTy } // ComponentHelper -void OPropertySetHelper::disposing() SAL_THROW( () ) +void OPropertySetHelper::disposing() SAL_THROW(()) { // Create an event with this as sender Reference < XPropertySet > rSource( SAL_STATIC_CAST( XPropertySet * , this ) , UNO_QUERY ); @@ -265,7 +265,7 @@ void OPropertySetHelper::disposing() SAL_THROW( () ) } Reference < XPropertySetInfo > OPropertySetHelper::createPropertySetInfo( - IPropertyArrayHelper & rProperties ) SAL_THROW( () ) + IPropertyArrayHelper & rProperties ) SAL_THROW(()) { return static_cast< XPropertySetInfo * >( new OPropertySetHelperInfo_Impl( rProperties ) ); } @@ -1126,7 +1126,7 @@ static int compare_Property_Impl( const void *arg1, const void *arg2 ) } -void OPropertyArrayHelper::init( sal_Bool bSorted ) SAL_THROW( () ) +void OPropertyArrayHelper::init( sal_Bool bSorted ) SAL_THROW(()) { sal_Int32 i, nElements = aInfos.getLength(); const Property* pProperties = aInfos.getConstArray(); @@ -1157,7 +1157,7 @@ OPropertyArrayHelper::OPropertyArrayHelper( Property * pProps, sal_Int32 nEle, sal_Bool bSorted ) - SAL_THROW( () ) + SAL_THROW(()) : aInfos(pProps, nEle) , bRightOrdered( sal_False ) { @@ -1167,7 +1167,7 @@ OPropertyArrayHelper::OPropertyArrayHelper( OPropertyArrayHelper::OPropertyArrayHelper( const Sequence< Property > & aProps, sal_Bool bSorted ) - SAL_THROW( () ) + SAL_THROW(()) : aInfos(aProps) , bRightOrdered( sal_False ) { diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx index d0dea93cf664..ff4f41769b56 100644 --- a/cppuhelper/source/servicefactory.cxx +++ b/cppuhelper/source/servicefactory.cxx @@ -71,10 +71,10 @@ namespace cppu { Reference< security::XAccessController > -createDefaultAccessController() SAL_THROW( () ); +createDefaultAccessController() SAL_THROW(()); Reference< lang::XSingleComponentFactory > -create_boostrap_macro_expander_factory() SAL_THROW( () ); +create_boostrap_macro_expander_factory() SAL_THROW(()); OUString const & get_this_libpath(); @@ -105,7 +105,7 @@ static Reference< XInterface > SAL_CALL createInstance( Reference< registry::XSimpleRegistry > SAL_CALL createSimpleRegistry( OUString const & rBootstrapPath ) - SAL_THROW( () ) + SAL_THROW(()) { try { @@ -136,7 +136,7 @@ Reference< registry::XSimpleRegistry > SAL_CALL createSimpleRegistry( Reference< registry::XSimpleRegistry > SAL_CALL createNestedRegistry( OUString const & rBootstrapPath ) - SAL_THROW( () ) + SAL_THROW(()) { try { diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 48596aa40a2d..068a50a27247 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -59,7 +59,7 @@ namespace cppu #if OSL_DEBUG_LEVEL > 1 //------------------------------------------------------------------------------ -static inline void out( const char * p ) SAL_THROW( () ) +static inline void out( const char * p ) SAL_THROW(()) { printf( "%s\n", p ); } @@ -128,7 +128,7 @@ namespace } //------------------------------------------------------------------------------ -static const ::std::vector< OUString > * getAccessDPath() SAL_THROW( () ) +static const ::std::vector< OUString > * getAccessDPath() SAL_THROW(()) { return theAccessDPath::get().getAccessDPath(); } @@ -206,7 +206,7 @@ static bool checkAccessPath( OUString * pComp ) throw () //------------------------------------------------------------------------------ static inline sal_Int32 endsWith( - const OUString & rText, const OUString & rEnd ) SAL_THROW( () ) + const OUString & rText, const OUString & rEnd ) SAL_THROW(()) { if (rText.getLength() >= rEnd.getLength() && rEnd.equalsIgnoreAsciiCase( diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index a63f59bedf01..8217d8eecd58 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -732,7 +732,7 @@ class EventListenerImpl public: inline EventListenerImpl( Reference< container::XHierarchicalNameAccess > const & xTDMgr ) - SAL_THROW( () ) + SAL_THROW(()) : m_xTDMgr( xTDMgr ) {} @@ -754,7 +754,7 @@ void EventListenerImpl::disposing( lang::EventObject const & rEvt ) //================================================================================================== sal_Bool SAL_CALL installTypeDescriptionManager( Reference< container::XHierarchicalNameAccess > const & xTDMgr_c ) - SAL_THROW( () ) + SAL_THROW(()) { uno::Environment curr_env(Environment::getCurrent()); uno::Environment target_env(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV)))); diff --git a/cppuhelper/source/typeprovider.cxx b/cppuhelper/source/typeprovider.cxx index 3f224f0a89c7..4887669128c7 100644 --- a/cppuhelper/source/typeprovider.cxx +++ b/cppuhelper/source/typeprovider.cxx @@ -37,12 +37,12 @@ namespace cppu { //__________________________________________________________________________________________________ -OImplementationId::~OImplementationId() SAL_THROW( () ) +OImplementationId::~OImplementationId() SAL_THROW(()) { delete _pSeq; } //__________________________________________________________________________________________________ -Sequence< sal_Int8 > OImplementationId::getImplementationId() const SAL_THROW( () ) +Sequence< sal_Int8 > OImplementationId::getImplementationId() const SAL_THROW(()) { if (! _pSeq) { @@ -59,7 +59,7 @@ Sequence< sal_Int8 > OImplementationId::getImplementationId() const SAL_THROW( ( //-------------------------------------------------------------------------------------------------- static inline void copy( Sequence< Type > & rDest, const Sequence< Type > & rSource, sal_Int32 nOffset ) - SAL_THROW( () ) + SAL_THROW(()) { Type * pDest = rDest.getArray(); const Type * pSource = rSource.getConstArray(); @@ -72,7 +72,7 @@ static inline void copy( Sequence< Type > & rDest, const Sequence< Type > & rSou OTypeCollection::OTypeCollection( const Type & rType1, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 1 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -83,7 +83,7 @@ OTypeCollection::OTypeCollection( const Type & rType1, const Type & rType2, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 2 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -96,7 +96,7 @@ OTypeCollection::OTypeCollection( const Type & rType2, const Type & rType3, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 3 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -111,7 +111,7 @@ OTypeCollection::OTypeCollection( const Type & rType3, const Type & rType4, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 4 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -128,7 +128,7 @@ OTypeCollection::OTypeCollection( const Type & rType4, const Type & rType5, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 5 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -147,7 +147,7 @@ OTypeCollection::OTypeCollection( const Type & rType5, const Type & rType6, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 6 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -168,7 +168,7 @@ OTypeCollection::OTypeCollection( const Type & rType6, const Type & rType7, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 7 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -191,7 +191,7 @@ OTypeCollection::OTypeCollection( const Type & rType7, const Type & rType8, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 8 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -216,7 +216,7 @@ OTypeCollection::OTypeCollection( const Type & rType8, const Type & rType9, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 9 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -243,7 +243,7 @@ OTypeCollection::OTypeCollection( const Type & rType9, const Type & rType10, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 10 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -272,7 +272,7 @@ OTypeCollection::OTypeCollection( const Type & rType10, const Type & rType11, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 11 + rAddTypes.getLength() ) { _aTypes[0] = rType1; @@ -303,7 +303,7 @@ OTypeCollection::OTypeCollection( const Type & rType11, const Type & rType12, const Sequence< Type > & rAddTypes ) - SAL_THROW( () ) + SAL_THROW(()) : _aTypes( 12 + rAddTypes.getLength() ) { _aTypes[0] = rType1; diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx index 2e7e1832ba3c..b40cb444388d 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -39,7 +39,7 @@ namespace cppu { // due to static Reflection destruction from usr, ther must be a mutex leak (#73272#) -inline static Mutex & getWeakMutex() SAL_THROW( () ) +inline static Mutex & getWeakMutex() SAL_THROW(()) { static Mutex * s_pMutex = 0; if (! s_pMutex) @@ -56,7 +56,7 @@ public: /** Hold the weak object without an acquire (only the pointer). */ - OWeakConnectionPoint( OWeakObject* pObj ) SAL_THROW( () ) + OWeakConnectionPoint( OWeakObject* pObj ) SAL_THROW(()) : m_aRefCount( 0 ) , m_pObject(pObj) , m_aReferences( getWeakMutex() ) @@ -181,7 +181,7 @@ void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference #ifdef _MSC_VER // Accidentally occurs in msvc mapfile = > had to be outlined. -OWeakObject::OWeakObject() SAL_THROW( () ) +OWeakObject::OWeakObject() SAL_THROW(()) : m_refCount( 0 ), m_pWeakConnectionPoint( 0 ) { @@ -328,9 +328,9 @@ namespace uno class OWeakRefListener : public XReference { public: - OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () ); - OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW( () ); - virtual ~OWeakRefListener() SAL_THROW( () ); + OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW(()); + OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW(()); + virtual ~OWeakRefListener() SAL_THROW(()); // XInterface Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException); @@ -346,10 +346,10 @@ public: Reference< XAdapter > m_XWeakConnectionPoint; private: - OWeakRefListener& SAL_CALL operator=(const OWeakRefListener& rRef) SAL_THROW( () ); + OWeakRefListener& SAL_CALL operator=(const OWeakRefListener& rRef) SAL_THROW(()); }; -OWeakRefListener::OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () ) +OWeakRefListener::OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW(()) : com::sun::star::uno::XReference() , m_aRefCount( 1 ) { @@ -366,7 +366,7 @@ OWeakRefListener::OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () ) osl_decrementInterlockedCount( &m_aRefCount ); } -OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW( () ) +OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW(()) : m_aRefCount( 1 ) { try @@ -387,7 +387,7 @@ OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THRO osl_decrementInterlockedCount( &m_aRefCount ); } -OWeakRefListener::~OWeakRefListener() SAL_THROW( () ) +OWeakRefListener::~OWeakRefListener() SAL_THROW(()) { try { @@ -440,7 +440,7 @@ void SAL_CALL OWeakRefListener::dispose() //------------------------------------------------------------------------ //-- WeakReferenceHelper ---------------------------------------------------------- //------------------------------------------------------------------------ -WeakReferenceHelper::WeakReferenceHelper(const Reference< XInterface >& xInt) SAL_THROW( () ) +WeakReferenceHelper::WeakReferenceHelper(const Reference< XInterface >& xInt) SAL_THROW(()) : m_pImpl( 0 ) { if (xInt.is()) @@ -450,7 +450,7 @@ WeakReferenceHelper::WeakReferenceHelper(const Reference< XInterface >& xInt) SA } } -WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef) SAL_THROW( () ) +WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef) SAL_THROW(()) : m_pImpl( 0 ) { Reference< XInterface > xInt( rWeakRef.get() ); @@ -461,7 +461,7 @@ WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef) SA } } -void WeakReferenceHelper::clear() SAL_THROW( () ) +void WeakReferenceHelper::clear() SAL_THROW(()) { try { @@ -480,7 +480,7 @@ void WeakReferenceHelper::clear() SAL_THROW( () ) catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected() } -WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& rWeakRef) SAL_THROW( () ) +WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& rWeakRef) SAL_THROW(()) { if (this == &rWeakRef) { @@ -492,7 +492,7 @@ WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& r WeakReferenceHelper & SAL_CALL WeakReferenceHelper::operator= (const Reference< XInterface > & xInt) -SAL_THROW( () ) +SAL_THROW(()) { try { @@ -507,12 +507,12 @@ SAL_THROW( () ) return *this; } -WeakReferenceHelper::~WeakReferenceHelper() SAL_THROW( () ) +WeakReferenceHelper::~WeakReferenceHelper() SAL_THROW(()) { clear(); } -Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW( () ) +Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW(()) { try { |