diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
tree | d4451246461346a425ad6f796e08bf1514cdd942 /xmlhelp/source/treeview | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'xmlhelp/source/treeview')
-rw-r--r-- | xmlhelp/source/treeview/tvfactory.cxx | 14 | ||||
-rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 22 |
2 files changed, 18 insertions, 18 deletions
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index b98bd69e630a..12f455f8488f 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -61,7 +61,7 @@ TVFactory::release( Any SAL_CALL TVFactory::queryInterface( const Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, (static_cast< XServiceInfo* >(this)), @@ -82,7 +82,7 @@ XTYPEPROVIDER_IMPL_3( TVFactory, OUString SAL_CALL TVFactory::getImplementationName() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return TVFactory::getImplementationName_static(); } @@ -90,7 +90,7 @@ TVFactory::getImplementationName() sal_Bool SAL_CALL TVFactory::supportsService( const OUString& ServiceName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return ServiceName.equalsAscii( "com.sun.star.help.TreeView" ) || @@ -99,7 +99,7 @@ TVFactory::supportsService( Sequence< OUString > SAL_CALL TVFactory::getSupportedServiceNames( void ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return TVFactory::getSupportedServiceNames_static(); } @@ -110,7 +110,7 @@ Reference< XInterface > SAL_CALL TVFactory::createInstance( const OUString& aServiceSpecifier ) throw( Exception, - RuntimeException ) + RuntimeException, std::exception ) { Any aAny; aAny <<= OUString(); @@ -130,7 +130,7 @@ TVFactory::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& Arguments ) throw( Exception, - RuntimeException ) + RuntimeException, std::exception ) { (void)ServiceSpecifier; @@ -172,7 +172,7 @@ TVFactory::createInstanceWithArguments( Sequence< OUString > SAL_CALL TVFactory::getAvailableServiceNames( ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Sequence< OUString > seq( 1 ); seq[0] = "com.sun.star.ucb.HierarchyDataReadAccess"; diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 3e1df8327f87..7017f0572d86 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -250,7 +250,7 @@ TVBase::release( Any SAL_CALL TVBase::queryInterface( const Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, (static_cast< XTypeProvider* >(this)), @@ -301,7 +301,7 @@ Any SAL_CALL TVRead::getByName( const OUString& aName ) throw( NoSuchElementException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { bool found( true ); Any aAny; @@ -325,7 +325,7 @@ TVRead::getByName( const OUString& aName ) Sequence< OUString > SAL_CALL TVRead::getElementNames( ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Sequence< OUString > seq( 3 ); @@ -338,7 +338,7 @@ TVRead::getElementNames( ) sal_Bool SAL_CALL TVRead::hasByName( const OUString& aName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if( aName.equalsAscii( "Title" ) || aName.equalsAscii( "TargetURL" ) || @@ -353,7 +353,7 @@ TVRead::hasByName( const OUString& aName ) Any SAL_CALL TVRead::getByHierarchicalName( const OUString& aName ) throw( NoSuchElementException, - RuntimeException ) + RuntimeException, std::exception ) { sal_Int32 idx; OUString name( aName ); @@ -367,7 +367,7 @@ TVRead::getByHierarchicalName( const OUString& aName ) sal_Bool SAL_CALL TVRead::hasByHierarchicalName( const OUString& aName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { sal_Int32 idx; OUString name( aName ); @@ -573,7 +573,7 @@ Any SAL_CALL TVChildTarget::getByName( const OUString& aName ) throw( NoSuchElementException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { OUString num( aName.getStr()+2,aName.getLength()-4 ); sal_Int32 idx = num.toInt32() - 1; @@ -588,7 +588,7 @@ TVChildTarget::getByName( const OUString& aName ) Sequence< OUString > SAL_CALL TVChildTarget::getElementNames( ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Sequence< OUString > seq( Elements.size() ); for( unsigned i = 0; i < Elements.size(); ++i ) @@ -599,7 +599,7 @@ TVChildTarget::getElementNames( ) sal_Bool SAL_CALL TVChildTarget::hasByName( const OUString& aName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { OUString num( aName.getStr()+2,aName.getLength()-4 ); sal_Int32 idx = num.toInt32() - 1; @@ -614,7 +614,7 @@ TVChildTarget::hasByName( const OUString& aName ) Any SAL_CALL TVChildTarget::getByHierarchicalName( const OUString& aName ) throw( NoSuchElementException, - RuntimeException ) + RuntimeException, std::exception ) { sal_Int32 idx; OUString name( aName ); @@ -635,7 +635,7 @@ TVChildTarget::getByHierarchicalName( const OUString& aName ) sal_Bool SAL_CALL TVChildTarget::hasByHierarchicalName( const OUString& aName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { sal_Int32 idx; OUString name( aName ); |