diff options
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/access_control.cxx | 14 | ||||
| -rw-r--r-- | cppuhelper/source/component_context.cxx | 40 | ||||
| -rw-r--r-- | cppuhelper/source/exc_thrower.cxx | 16 | ||||
| -rw-r--r-- | cppuhelper/source/factory.cxx | 28 | ||||
| -rw-r--r-- | cppuhelper/source/implbase.cxx | 56 | ||||
| -rw-r--r-- | cppuhelper/source/implbase_ex.cxx | 14 | ||||
| -rw-r--r-- | cppuhelper/source/macro_expander.cxx | 12 | ||||
| -rw-r--r-- | cppuhelper/source/propshlp.cxx | 4 | ||||
| -rw-r--r-- | cppuhelper/source/tdmgr.cxx | 2 | ||||
| -rw-r--r-- | cppuhelper/source/typeprovider.cxx | 30 | ||||
| -rw-r--r-- | cppuhelper/source/weak.cxx | 20 | ||||
| -rw-r--r-- | cppuhelper/test/cfg_test.cxx | 22 | ||||
| -rw-r--r-- | cppuhelper/test/testpropshlp.cxx | 14 |
13 files changed, 136 insertions, 136 deletions
diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx index 1df5d2d21c30..fcac34619aae 100644 --- a/cppuhelper/source/access_control.cxx +++ b/cppuhelper/source/access_control.cxx @@ -41,7 +41,7 @@ namespace namespace cppu { -//__________________________________________________________________________________________________ + AccessControl::AccessControl( Reference< XComponentContext > const & xContext ) SAL_THROW( (RuntimeException) ) { @@ -51,7 +51,7 @@ AccessControl::AccessControl( Reference< XComponentContext > const & xContext ) "no access controller!", Reference< XInterface >() ); } } -//__________________________________________________________________________________________________ + AccessControl::AccessControl( Reference< security::XAccessController > const & xController ) SAL_THROW( (RuntimeException) ) @@ -63,7 +63,7 @@ AccessControl::AccessControl( "no access controller!", Reference< XInterface >() ); } } -//__________________________________________________________________________________________________ + AccessControl::AccessControl( AccessControl const & ac ) SAL_THROW( (RuntimeException) ) : m_xController( ac.m_xController ) @@ -88,7 +88,7 @@ AccessControl::AccessControl( AccessControl const & ac ) #pragma pack(pop) #endif -//-------------------------------------------------------------------------------------------------- + inline void __checkPermission( Reference< security::XAccessController > const & xController, Type const & type, rtl_uString * str1, rtl_uString * str2 ) @@ -104,7 +104,7 @@ inline void __checkPermission( xController->checkPermission( * static_cast< Any * >( &a ) ); } -//__________________________________________________________________________________________________ + void AccessControl::checkRuntimePermission( OUString const & name ) SAL_THROW( (RuntimeException) ) @@ -113,7 +113,7 @@ void AccessControl::checkRuntimePermission( m_xController, ::getCppuType( (security::RuntimePermission *)0 ), name.pData, 0 ); } -//__________________________________________________________________________________________________ + void AccessControl::checkFilePermission( OUString const & url, OUString const & actions ) @@ -123,7 +123,7 @@ void AccessControl::checkFilePermission( m_xController, ::getCppuType( (io::FilePermission *)0 ), url.pData, actions.pData ); } -//__________________________________________________________________________________________________ + void AccessControl::checkSocketPermission( OUString const & host, OUString const & actions ) diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index f19e243a92d8..b1983ee34fe8 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -70,7 +70,7 @@ namespace cppu { #ifdef CONTEXT_DIAG -//-------------------------------------------------------------------------------------------------- + static OUString val2str( void const * pVal, typelib_TypeDescriptionReference * pTypeRef ) { OSL_ASSERT( pVal ); @@ -255,7 +255,7 @@ static OUString val2str( void const * pVal, typelib_TypeDescriptionReference * p return buf.makeStringAndClear(); } -//-------------------------------------------------------------------------------------------------- + static void dumpEntry( OUString const & key, Any const & value ) { OUString val( val2str( value.getValue(), value.getValueTypeRef() ) ); @@ -264,7 +264,7 @@ static void dumpEntry( OUString const & key, Any const & value ) ::fprintf( stderr, "| %s = %s\n", key_str.getStr(), val_str.getStr() ); } #endif -//-------------------------------------------------------------------------------------------------- + static inline void try_dispose( Reference< XInterface > const & xInstance ) SAL_THROW( (RuntimeException) ) { @@ -274,7 +274,7 @@ static inline void try_dispose( Reference< XInterface > const & xInstance ) xComp->dispose(); } } -//-------------------------------------------------------------------------------------------------- + static inline void try_dispose( Reference< lang::XComponent > const & xComp ) SAL_THROW( (RuntimeException) ) { @@ -305,7 +305,7 @@ public: virtual void SAL_CALL disposing( lang::EventObject const & rSource ) throw (RuntimeException); }; -//__________________________________________________________________________________________________ + inline void DisposingForwarder::listen( Reference< lang::XComponent > const & xSource, Reference< lang::XComponent > const & xTarget ) @@ -316,7 +316,7 @@ inline void DisposingForwarder::listen( xSource->addEventListener( new DisposingForwarder( xTarget ) ); } } -//__________________________________________________________________________________________________ + void DisposingForwarder::disposing( lang::EventObject const & ) throw (RuntimeException) { @@ -400,7 +400,7 @@ public: }; // XNameContainer -//______________________________________________________________________________ + void ComponentContext::insertByName( OUString const & name, Any const & element ) throw (lang::IllegalArgumentException, container::ElementExistException, @@ -421,7 +421,7 @@ void ComponentContext::insertByName( static_cast<OWeakObject *>(this) ); } -//______________________________________________________________________________ + void ComponentContext::removeByName( OUString const & name ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) @@ -438,7 +438,7 @@ void ComponentContext::removeByName( OUString const & name ) } // XNameReplace -//______________________________________________________________________________ + void ComponentContext::replaceByName( OUString const & name, Any const & element ) throw (lang::IllegalArgumentException,container::NoSuchElementException, @@ -464,7 +464,7 @@ void ComponentContext::replaceByName( } // XNameAccess -//______________________________________________________________________________ + Any ComponentContext::getByName( OUString const & name ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) @@ -472,7 +472,7 @@ Any ComponentContext::getByName( OUString const & name ) return getValueByName( name ); } -//______________________________________________________________________________ + Sequence<OUString> ComponentContext::getElementNames() throw (RuntimeException) { @@ -487,7 +487,7 @@ Sequence<OUString> ComponentContext::getElementNames() return ret; } -//______________________________________________________________________________ + sal_Bool ComponentContext::hasByName( OUString const & name ) throw (RuntimeException) { @@ -496,20 +496,20 @@ sal_Bool ComponentContext::hasByName( OUString const & name ) } // XElementAccess -//______________________________________________________________________________ + Type ComponentContext::getElementType() throw (RuntimeException) { return ::getVoidCppuType(); } -//______________________________________________________________________________ + sal_Bool ComponentContext::hasElements() throw (RuntimeException) { MutexGuard guard( m_mutex ); return ! m_map.empty(); } -//__________________________________________________________________________________________________ + Any ComponentContext::lookupMap( OUString const & rName ) SAL_THROW( (RuntimeException) ) { @@ -629,7 +629,7 @@ Any ComponentContext::lookupMap( OUString const & rName ) return ret; } -//__________________________________________________________________________________________________ + Any ComponentContext::getValueByName( OUString const & rName ) throw (RuntimeException) { @@ -649,7 +649,7 @@ Any ComponentContext::getValueByName( OUString const & rName ) } return ret; } -//__________________________________________________________________________________________________ + Reference< lang::XMultiComponentFactory > ComponentContext::getServiceManager() throw (RuntimeException) { @@ -661,7 +661,7 @@ Reference< lang::XMultiComponentFactory > ComponentContext::getServiceManager() } return m_xSMgr; } -//__________________________________________________________________________________________________ + ComponentContext::~ComponentContext() SAL_THROW(()) { @@ -674,7 +674,7 @@ ComponentContext::~ComponentContext() delete iPos->second; m_map.clear(); } -//__________________________________________________________________________________________________ + void ComponentContext::disposing() { #ifdef CONTEXT_DIAG @@ -739,7 +739,7 @@ void ComponentContext::disposing() delete iPos->second; m_map.clear(); } -//__________________________________________________________________________________________________ + ComponentContext::ComponentContext( ContextEntry_Init const * pEntries, sal_Int32 nEntries, Reference< XComponentContext > const & xDelegate ) diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx index 70a227410cf5..0e18f5d070d0 100644 --- a/cppuhelper/source/exc_thrower.cxx +++ b/cppuhelper/source/exc_thrower.cxx @@ -67,12 +67,12 @@ struct ExceptionThrower : public uno_Interface, XExceptionThrower extern "C" { -//------------------------------------------------------------------------------ + static void SAL_CALL ExceptionThrower_acquire_release_nop( SAL_UNUSED_PARAMETER uno_Interface * ) {} -//------------------------------------------------------------------------------ + static void SAL_CALL ExceptionThrower_dispatch( uno_Interface * pUnoI, typelib_TypeDescription const * pMemberType, void * pReturn, void * pArgs [], uno_Any ** ppException ) @@ -131,7 +131,7 @@ static void SAL_CALL ExceptionThrower_dispatch( } // extern "C" -//______________________________________________________________________________ + Any ExceptionThrower::queryInterface( Type const & type ) throw (RuntimeException) { @@ -145,29 +145,29 @@ Any ExceptionThrower::queryInterface( Type const & type ) return Any(); } -//______________________________________________________________________________ + void ExceptionThrower::acquire() throw () { } -//______________________________________________________________________________ + void ExceptionThrower::release() throw () { } -//______________________________________________________________________________ + void ExceptionThrower::throwException( Any const & exc ) throw (Exception) { OSL_FAIL( "unexpected!" ); throwException( exc ); } -//______________________________________________________________________________ + void ExceptionThrower::rethrowException() throw (Exception) { throw; } -//______________________________________________________________________________ + inline ExceptionThrower::ExceptionThrower() { uno_Interface::acquire = ExceptionThrower_acquire_release_nop; diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 85a231880a2b..b2d18af32aaa 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -140,7 +140,7 @@ OSingleFactoryHelper::~OSingleFactoryHelper() } -//----------------------------------------------------------------------------- + Any OSingleFactoryHelper::queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException) { @@ -195,14 +195,14 @@ Reference<XInterface > OSingleFactoryHelper::createInstanceWithArguments( } // XSingleComponentFactory -//__________________________________________________________________________________________________ + Reference< XInterface > OSingleFactoryHelper::createInstanceWithContext( Reference< XComponentContext > const & xContext ) throw (Exception, RuntimeException) { return createInstanceEveryTime( xContext ); } -//__________________________________________________________________________________________________ + Reference< XInterface > OSingleFactoryHelper::createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) @@ -413,7 +413,7 @@ Reference<XInterface > OFactoryComponentHelper::createInstanceWithArguments( } // XSingleComponentFactory -//__________________________________________________________________________________________________ + Reference< XInterface > OFactoryComponentHelper::createInstanceWithContext( Reference< XComponentContext > const & xContext ) throw (Exception, RuntimeException) @@ -431,7 +431,7 @@ Reference< XInterface > OFactoryComponentHelper::createInstanceWithContext( } return OSingleFactoryHelper::createInstanceWithContext( xContext ); } -//__________________________________________________________________________________________________ + Reference< XInterface > OFactoryComponentHelper::createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) @@ -564,7 +564,7 @@ protected: }; // XInterface -//______________________________________________________________________________ + Any SAL_CALL ORegistryFactoryHelper::queryInterface( Type const & type ) throw (RuntimeException) { @@ -575,20 +575,20 @@ Any SAL_CALL ORegistryFactoryHelper::queryInterface( return OPropertySetHelper::queryInterface( type ); } -//______________________________________________________________________________ + void ORegistryFactoryHelper::acquire() throw () { OFactoryComponentHelper::acquire(); } -//______________________________________________________________________________ + void ORegistryFactoryHelper::release() throw () { OFactoryComponentHelper::release(); } // XTypeProvider -//______________________________________________________________________________ + Sequence< Type > ORegistryFactoryHelper::getTypes() throw (RuntimeException) { Sequence< Type > types( OFactoryComponentHelper::getTypes() ); @@ -605,7 +605,7 @@ Sequence< Type > ORegistryFactoryHelper::getTypes() throw (RuntimeException) } // XPropertySet -//______________________________________________________________________________ + Reference< beans::XPropertySetInfo > ORegistryFactoryHelper::getPropertySetInfo() throw (RuntimeException) { @@ -616,7 +616,7 @@ ORegistryFactoryHelper::getPropertySetInfo() throw (RuntimeException) } // OPropertySetHelper -//______________________________________________________________________________ + IPropertyArrayHelper & ORegistryFactoryHelper::getInfoHelper() { ::osl::MutexGuard guard( aMutex ); @@ -634,7 +634,7 @@ IPropertyArrayHelper & ORegistryFactoryHelper::getInfoHelper() return *m_property_array_helper.get(); } -//______________________________________________________________________________ + sal_Bool ORegistryFactoryHelper::convertFastPropertyValue( Any &, Any &, sal_Int32, Any const & ) throw (lang::IllegalArgumentException) @@ -643,7 +643,7 @@ sal_Bool ORegistryFactoryHelper::convertFastPropertyValue( return false; } -//______________________________________________________________________________ + void ORegistryFactoryHelper::setFastPropertyValue_NoBroadcast( sal_Int32, Any const & ) throw (Exception) @@ -653,7 +653,7 @@ void ORegistryFactoryHelper::setFastPropertyValue_NoBroadcast( static_cast< OWeakObject * >(this) ); } -//______________________________________________________________________________ + void ORegistryFactoryHelper::getFastPropertyValue( Any & rValue, sal_Int32 nHandle ) const { diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx index 983622ca5bfd..ecf7f9a36b15 100644 --- a/cppuhelper/source/implbase.cxx +++ b/cppuhelper/source/implbase.cxx @@ -48,7 +48,7 @@ Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW(()) } // ClassDataBase -//__________________________________________________________________________________________________ + ClassDataBase::ClassDataBase() SAL_THROW(()) : bOffsetsInit( sal_False ) , nType2Offset( 0 ) @@ -57,7 +57,7 @@ ClassDataBase::ClassDataBase() SAL_THROW(()) , pId( 0 ) { } -//__________________________________________________________________________________________________ + ClassDataBase::ClassDataBase( sal_Int32 nClassCode_ ) SAL_THROW(()) : bOffsetsInit( sal_False ) , nType2Offset( 0 ) @@ -66,7 +66,7 @@ ClassDataBase::ClassDataBase( sal_Int32 nClassCode_ ) SAL_THROW(()) , pId( 0 ) { } -//__________________________________________________________________________________________________ + ClassDataBase::~ClassDataBase() SAL_THROW(()) { delete pTypes; @@ -80,7 +80,7 @@ ClassDataBase::~ClassDataBase() SAL_THROW(()) } // ClassData -//__________________________________________________________________________________________________ + void ClassData::writeTypeOffset( const Type & rType, sal_Int32 nOffset ) SAL_THROW(()) { arType2Offset[nType2Offset].nOffset = nOffset; @@ -100,7 +100,7 @@ void ClassData::writeTypeOffset( const Type & rType, sal_Int32 nOffset ) SAL_THR } #endif } -//__________________________________________________________________________________________________ + void ClassData::initTypeProvider() SAL_THROW(()) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); @@ -141,14 +141,14 @@ void ClassData::initTypeProvider() SAL_THROW(()) pTypes = types; } } -//__________________________________________________________________________________________________ + Sequence< Type > ClassData::getTypes() SAL_THROW(()) { if (! pTypes) initTypeProvider(); return *pTypes; } -//__________________________________________________________________________________________________ + Sequence< sal_Int8 > ClassData::getImplementationId() SAL_THROW(()) { if (! pTypes) @@ -156,7 +156,7 @@ Sequence< sal_Int8 > ClassData::getImplementationId() SAL_THROW(()) return *pId; } -//-------------------------------------------------------------------------------------------------- + static inline bool td_equals( typelib_TypeDescription * pTD, typelib_TypeDescriptionReference * pType ) SAL_THROW(()) @@ -165,7 +165,7 @@ static inline bool td_equals( (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(()) { if (rType == ::getCppuType( (const Reference< XInterface > *)0 )) @@ -196,22 +196,22 @@ Any ClassData::query( const Type & rType, lang::XTypeProvider * pBase ) SAL_THRO //################################################################################################## // WeakComponentImplHelperBase -//__________________________________________________________________________________________________ + WeakComponentImplHelperBase::WeakComponentImplHelperBase( Mutex & rMutex ) SAL_THROW(()) : rBHelper( rMutex ) { } -//__________________________________________________________________________________________________ + WeakComponentImplHelperBase::~WeakComponentImplHelperBase() SAL_THROW(()) { } -//__________________________________________________________________________________________________ + void WeakComponentImplHelperBase::disposing() { } -//__________________________________________________________________________________________________ + Any WeakComponentImplHelperBase::queryInterface( Type const & rType ) throw (RuntimeException) { @@ -222,13 +222,13 @@ Any WeakComponentImplHelperBase::queryInterface( Type const & rType ) } return OWeakObject::queryInterface( rType ); } -//__________________________________________________________________________________________________ + void WeakComponentImplHelperBase::acquire() throw () { OWeakObject::acquire(); } -//__________________________________________________________________________________________________ + void WeakComponentImplHelperBase::release() throw () { @@ -252,7 +252,7 @@ void WeakComponentImplHelperBase::release() OWeakObject::release(); } } -//__________________________________________________________________________________________________ + void WeakComponentImplHelperBase::dispose() throw (RuntimeException) { @@ -296,7 +296,7 @@ void WeakComponentImplHelperBase::dispose() } } } -//__________________________________________________________________________________________________ + void WeakComponentImplHelperBase::addEventListener( Reference< lang::XEventListener > const & xListener ) throw (RuntimeException) @@ -313,7 +313,7 @@ void WeakComponentImplHelperBase::addEventListener( rBHelper.addListener( ::getCppuType( &xListener ), xListener ); } } -//__________________________________________________________________________________________________ + void WeakComponentImplHelperBase::removeEventListener( Reference< lang::XEventListener > const & xListener ) throw (RuntimeException) @@ -322,28 +322,28 @@ void WeakComponentImplHelperBase::removeEventListener( } // WeakAggComponentImplHelperBase -//__________________________________________________________________________________________________ + WeakAggComponentImplHelperBase::WeakAggComponentImplHelperBase( Mutex & rMutex ) SAL_THROW(()) : rBHelper( rMutex ) { } -//__________________________________________________________________________________________________ + WeakAggComponentImplHelperBase::~WeakAggComponentImplHelperBase() SAL_THROW(()) { } -//__________________________________________________________________________________________________ + void WeakAggComponentImplHelperBase::disposing() { } -//__________________________________________________________________________________________________ + Any WeakAggComponentImplHelperBase::queryInterface( Type const & rType ) throw (RuntimeException) { return OWeakAggObject::queryInterface( rType ); } -//__________________________________________________________________________________________________ + Any WeakAggComponentImplHelperBase::queryAggregation( Type const & rType ) throw (RuntimeException) { @@ -354,13 +354,13 @@ Any WeakAggComponentImplHelperBase::queryAggregation( Type const & rType ) } return OWeakAggObject::queryAggregation( rType ); } -//__________________________________________________________________________________________________ + void WeakAggComponentImplHelperBase::acquire() throw () { OWeakAggObject::acquire(); } -//__________________________________________________________________________________________________ + void WeakAggComponentImplHelperBase::release() throw () { @@ -388,7 +388,7 @@ void WeakAggComponentImplHelperBase::release() OWeakAggObject::release(); } } -//__________________________________________________________________________________________________ + void WeakAggComponentImplHelperBase::dispose() throw (RuntimeException) { @@ -432,7 +432,7 @@ void WeakAggComponentImplHelperBase::dispose() } } } -//__________________________________________________________________________________________________ + void WeakAggComponentImplHelperBase::addEventListener( Reference< lang::XEventListener > const & xListener ) throw (RuntimeException) @@ -449,7 +449,7 @@ void WeakAggComponentImplHelperBase::addEventListener( rBHelper.addListener( ::getCppuType( &xListener ), xListener ); } } -//__________________________________________________________________________________________________ + void WeakAggComponentImplHelperBase::removeEventListener( Reference< lang::XEventListener > const & xListener ) throw (RuntimeException) diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx index c2a87fb72fb3..e7a01ad1a680 100644 --- a/cppuhelper/source/implbase_ex.cxx +++ b/cppuhelper/source/implbase_ex.cxx @@ -45,7 +45,7 @@ namespace cppu */ ::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW(()); -//-------------------------------------------------------------------------------------------------- + static inline void checkInterface( Type const & rType ) SAL_THROW( (RuntimeException) ) { @@ -56,17 +56,17 @@ static inline void checkInterface( Type const & rType ) throw RuntimeException( msg, Reference< XInterface >() ); } } -//-------------------------------------------------------------------------------------------------- + static inline bool isXInterface( rtl_uString * pStr ) SAL_THROW(()) { return (*((OUString const *)&pStr) == "com.sun.star.uno.XInterface"); } -//-------------------------------------------------------------------------------------------------- + static inline void * makeInterface( sal_IntPtr nOffset, void * that ) SAL_THROW(()) { return (((char *)that) + nOffset); } -//-------------------------------------------------------------------------------------------------- + static inline bool __td_equals( typelib_TypeDescriptionReference const * pTDR1, typelib_TypeDescriptionReference const * pTDR2 ) @@ -75,7 +75,7 @@ static inline bool __td_equals( return ((pTDR1 == pTDR2) || ((OUString const *)&pTDR1->pTypeName)->equals( *(OUString const *)&pTDR2->pTypeName )); } -//-------------------------------------------------------------------------------------------------- + static inline type_entry * __getTypeEntries( class_data * cd ) SAL_THROW( (RuntimeException) ) { @@ -106,7 +106,7 @@ static inline type_entry * __getTypeEntries( class_data * cd ) } return pEntries; } -//-------------------------------------------------------------------------------------------------- + static inline void __fillTypes( Type * types, class_data * cd ) SAL_THROW( (RuntimeException) ) { @@ -116,7 +116,7 @@ static inline void __fillTypes( Type * types, class_data * cd ) types[ n ] = pEntries[ n ].m_type.typeRef; } } -//-------------------------------------------------------------------------------------------------- + namespace { bool recursivelyFindType( diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 45742962fb0a..f290fb71982e 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -144,27 +144,27 @@ public: throw (RuntimeException); }; -//__________________________________________________________________________________________________ + void Bootstrap_MacroExpander::disposing() {} -//__________________________________________________________________________________________________ + Bootstrap_MacroExpander::~Bootstrap_MacroExpander() SAL_THROW(()) {} // XServiceInfo impl -//__________________________________________________________________________________________________ + OUString Bootstrap_MacroExpander::getImplementationName() throw (RuntimeException) { return s_impl_name(); } -//__________________________________________________________________________________________________ + sal_Bool Bootstrap_MacroExpander::supportsService( OUString const & serviceName ) throw (RuntimeException) { return cppu::supportsService(this, serviceName); } -//__________________________________________________________________________________________________ + Sequence< OUString > Bootstrap_MacroExpander::getSupportedServiceNames() throw (RuntimeException) { @@ -172,7 +172,7 @@ Sequence< OUString > Bootstrap_MacroExpander::getSupportedServiceNames() } // XMacroExpander impl -//__________________________________________________________________________________________________ + OUString Bootstrap_MacroExpander::expandMacros( OUString const & exp ) throw (lang::IllegalArgumentException) { diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index 8953767cc7af..d276a9b5eb9c 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -588,7 +588,7 @@ Any OPropertySetHelper::getFastPropertyValue( sal_Int32 nHandle ) return aRet; } -//-------------------------------------------------------------------------- + void OPropertySetHelper::impl_fireAll( sal_Int32* i_handles, const Any* i_newValues, const Any* i_oldValues, sal_Int32 i_count ) { ClearableMutexGuard aGuard( rBHelper.rMutex ); @@ -624,7 +624,7 @@ void OPropertySetHelper::impl_fireAll( sal_Int32* i_handles, const Any* i_newVal fire( &allHandles[0], &allNewValues[0], &allOldValues[0], additionalEvents + i_count, sal_False ); } -//-------------------------------------------------------------------------- + void OPropertySetHelper::fire ( sal_Int32 * pnHandles, diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index 8e614d2ce39c..582e3f5699dc 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -628,7 +628,7 @@ public: virtual void SAL_CALL disposing( lang::EventObject const & rEvt ) throw (RuntimeException); }; -//__________________________________________________________________________________________________ + void EventListenerImpl::disposing( lang::EventObject const & rEvt ) throw (RuntimeException) { diff --git a/cppuhelper/source/typeprovider.cxx b/cppuhelper/source/typeprovider.cxx index ad8586f5eda8..29dd5a233948 100644 --- a/cppuhelper/source/typeprovider.cxx +++ b/cppuhelper/source/typeprovider.cxx @@ -27,12 +27,12 @@ using namespace com::sun::star::uno; namespace cppu { -//__________________________________________________________________________________________________ + OImplementationId::~OImplementationId() SAL_THROW(()) { delete _pSeq; } -//__________________________________________________________________________________________________ + Sequence< sal_Int8 > OImplementationId::getImplementationId() const SAL_THROW(()) { if (! _pSeq) @@ -48,7 +48,7 @@ Sequence< sal_Int8 > OImplementationId::getImplementationId() const SAL_THROW(() return *_pSeq; } -//-------------------------------------------------------------------------------------------------- + static inline void copy( Sequence< Type > & rDest, const Sequence< Type > & rSource, sal_Int32 nOffset ) SAL_THROW(()) { @@ -59,7 +59,7 @@ static inline void copy( Sequence< Type > & rDest, const Sequence< Type > & rSou pDest[nOffset+ nPos] = pSource[nPos]; } -//__________________________________________________________________________________________________ + OTypeCollection::OTypeCollection( const Type & rType1, const Sequence< Type > & rAddTypes ) @@ -69,7 +69,7 @@ OTypeCollection::OTypeCollection( _aTypes[0] = rType1; copy( _aTypes, rAddTypes, 1 ); } -//__________________________________________________________________________________________________ + OTypeCollection::OTypeCollection( const Type & rType1, const Type & rType2, @@ -81,7 +81,7 @@ OTypeCollection::OTypeCollection( _aTypes[1] = rType2; copy( _aTypes, rAddTypes, 2 ); } -//__________________________________________________________________________________________________ + OTypeCollection::OTypeCollection( const Type & rType1, const Type & rType2, @@ -95,7 +95,7 @@ OTypeCollection::OTypeCollection( _aTypes[2] = rType3; copy( _aTypes, rAddTypes, 3 ); } -//__________________________________________________________________________________________________ + OTypeCollection::OTypeCollection( const Type & rType1, const Type & rType2, @@ -111,7 +111,7 @@ OTypeCollection::OTypeCollection( _aTypes[3] = rType4; copy( _aTypes, rAddTypes, 4 ); } -//__________________________________________________________________________________________________ + OTypeCollection::OTypeCollection( const Type & rType1, const Type & rType2, @@ -129,7 +129,7 @@ OTypeCollection::OTypeCollection( _aTypes[4] = rType5; copy( _aTypes, rAddTypes, 5 ); } -//__________________________________________________________________________________________________ + OTypeCollection::OTypeCollection( const Type & rType1, const Type & rType2, @@ -149,7 +149,7 @@ OTypeCollection::OTypeCollection( _aTypes[5] = rType6; copy( _aTypes, rAddTypes, 6 ); } -//__________________________________________________________________________________________________ + OTypeCollection::OTypeCollection( const Type & rType1, const Type & rType2, @@ -171,7 +171,7 @@ OTypeCollection::OTypeCollection( _aTypes[6] = rType7; copy( _aTypes, rAddTypes, 7 ); } -//__________________________________________________________________________________________________ + OTypeCollection::OTypeCollection( const Type & rType1, const Type & rType2, @@ -195,7 +195,7 @@ OTypeCollection::OTypeCollection( _aTypes[7] = rType8; copy( _aTypes, rAddTypes, 8 ); } -//__________________________________________________________________________________________________ + OTypeCollection::OTypeCollection( const Type & rType1, const Type & rType2, @@ -221,7 +221,7 @@ OTypeCollection::OTypeCollection( _aTypes[8] = rType9; copy( _aTypes, rAddTypes, 9 ); } -//__________________________________________________________________________________________________ + OTypeCollection::OTypeCollection( const Type & rType1, const Type & rType2, @@ -249,7 +249,7 @@ OTypeCollection::OTypeCollection( _aTypes[9] = rType10; copy( _aTypes, rAddTypes, 10 ); } -//__________________________________________________________________________________________________ + OTypeCollection::OTypeCollection( const Type & rType1, const Type & rType2, @@ -279,7 +279,7 @@ OTypeCollection::OTypeCollection( _aTypes[10] = rType11; copy( _aTypes, rAddTypes, 11 ); } -//__________________________________________________________________________________________________ + OTypeCollection::OTypeCollection( const Type & rType1, const Type & rType2, diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx index 1429f64c81ba..857f64d50a4b 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -38,9 +38,9 @@ inline static Mutex & getWeakMutex() SAL_THROW(()) return *s_pMutex; } -//------------------------------------------------------------------------ + //-- OWeakConnectionPoint ---------------------------------------------------- -//------------------------------------------------------------------------ + class OWeakConnectionPoint : public XAdapter { public: @@ -166,9 +166,9 @@ void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference } -//------------------------------------------------------------------------ + //-- OWeakObject ------------------------------------------------------- -//------------------------------------------------------------------------ + #ifdef _MSC_VER // Accidentally occurs in msvc mapfile = > had to be outlined. @@ -247,9 +247,9 @@ Reference< XAdapter > SAL_CALL OWeakObject::queryAdapter() return m_pWeakConnectionPoint; } -//------------------------------------------------------------------------ + //-- OWeakAggObject ---------------------------------------------------- -//------------------------------------------------------------------------ + OWeakAggObject::~OWeakAggObject() SAL_THROW( (RuntimeException) ) { } @@ -313,9 +313,9 @@ namespace uno { -//------------------------------------------------------------------------ + //-- OWeakRefListener ----------------------------------------------------- -//------------------------------------------------------------------------ + class OWeakRefListener : public XReference { public: @@ -428,9 +428,9 @@ void SAL_CALL OWeakRefListener::dispose() xAdp->removeReference((XReference*)this); } -//------------------------------------------------------------------------ + //-- WeakReferenceHelper ---------------------------------------------------------- -//------------------------------------------------------------------------ + WeakReferenceHelper::WeakReferenceHelper(const Reference< XInterface >& xInt) SAL_THROW(()) : m_pImpl( 0 ) { diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx index c031fb7cbefa..b3eec0af67d3 100644 --- a/cppuhelper/test/cfg_test.cxx +++ b/cppuhelper/test/cfg_test.cxx @@ -50,24 +50,24 @@ using namespace ::com::sun::star::uno; namespace cfg_test { -//-------------------------------------------------------------------------------------------------- + static Sequence< OUString > impl0_getSupportedServiceNames() { OUString str("com.sun.star.bootstrap.TestComponent0"); return Sequence< OUString >( &str, 1 ); } -//-------------------------------------------------------------------------------------------------- + static OUString impl0_getImplementationName() { return OUString("com.sun.star.comp.bootstrap.TestComponent0"); } -//-------------------------------------------------------------------------------------------------- + static Sequence< OUString > impl1_getSupportedServiceNames() { OUString str("com.sun.star.bootstrap.TestComponent1"); return Sequence< OUString >( &str, 1 ); } -//-------------------------------------------------------------------------------------------------- + static OUString impl1_getImplementationName() { return OUString("com.sun.star.comp.bootstrap.TestComponent1"); @@ -90,7 +90,7 @@ public: virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException); }; -//__________________________________________________________________________________________________ + ServiceImpl0::ServiceImpl0( Reference< XComponentContext > const & xContext ) SAL_THROW(()) : m_xContext( xContext ) { @@ -113,7 +113,7 @@ ServiceImpl0::ServiceImpl0( Reference< XComponentContext > const & xContext ) SA OSL_VERIFY( val == "value of implprop1" ); } // XInitialization -//__________________________________________________________________________________________________ + void ServiceImpl0::initialize( const Sequence< Any >& rArgs ) throw (Exception, RuntimeException) { @@ -128,19 +128,19 @@ void ServiceImpl0::initialize( const Sequence< Any >& rArgs ) OSL_VERIFY( val == "third argument" ); } // XServiceInfo -//__________________________________________________________________________________________________ + OUString ServiceImpl0::getImplementationName() throw(::com::sun::star::uno::RuntimeException) { return impl0_getImplementationName(); } -//__________________________________________________________________________________________________ + Sequence< OUString > ServiceImpl0::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) { return impl0_getSupportedServiceNames(); } -//__________________________________________________________________________________________________ + sal_Bool ServiceImpl0::supportsService( const OUString & rServiceName ) throw(::com::sun::star::uno::RuntimeException) { @@ -159,13 +159,13 @@ public: virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException); virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); }; -//__________________________________________________________________________________________________ + OUString ServiceImpl1::getImplementationName() throw(::com::sun::star::uno::RuntimeException) { return impl1_getImplementationName(); } -//__________________________________________________________________________________________________ + Sequence< OUString > ServiceImpl1::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) { diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx index a20413461a5d..0919146b51fa 100644 --- a/cppuhelper/test/testpropshlp.cxx +++ b/cppuhelper/test/testpropshlp.cxx @@ -293,9 +293,9 @@ void test_PropertyArrayHelper() -//---------------------------------------------------- + // test_OPropertySetHelper -//---------------------------------------------------- + struct MutexContainer { Mutex aMutex; @@ -384,9 +384,9 @@ protected: void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const throw(RuntimeException); }; -//---------------------------------------------------------------------- + //------ The Properties of this implementation ------------------------- -//---------------------------------------------------------------------- + // Id must be the index into the array #define PROPERTY_BOOL 0 #define PROPERTY_INT16 1 @@ -421,9 +421,9 @@ Property * getBasicProps() } -//---------------------------------------------------- + // test_OPropertySetHelper_Listener -//---------------------------------------------------- + class test_OPropertySetHelper_Listener : public WeakImplHelper3< XPropertyChangeListener, XPropertiesChangeListener, XVetoableChangeListener > { @@ -744,7 +744,7 @@ void test_OPropertySetHelper::setFastPropertyValue_NoBroadcast } } -//-------------------------- + void test_OPropertySetHelper::getFastPropertyValue( Any & rRet, sal_Int32 nHandle ) const throw(RuntimeException) { |