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 /sd/source/ui/unoidl/unocpres.cxx | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'sd/source/ui/unoidl/unocpres.cxx')
-rw-r--r-- | sd/source/ui/unoidl/unocpres.cxx | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index 79770d7c0685..6f4db923bb24 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -65,19 +65,19 @@ UNO3_GETIMPLEMENTATION_IMPL( SdXCustomPresentation ); // XServiceInfo OUString SAL_CALL SdXCustomPresentation::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString( "SdXCustomPresentation" ) ; } sal_Bool SAL_CALL SdXCustomPresentation::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SdXCustomPresentation::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { OUString aSN( "com.sun.star.presentation.CustomPresentation" ); uno::Sequence< OUString > aSeq( &aSN, 1 ); @@ -86,7 +86,7 @@ uno::Sequence< OUString > SAL_CALL SdXCustomPresentation::getSupportedServiceNam // XIndexContainer void SAL_CALL SdXCustomPresentation::insertByIndex( sal_Int32 Index, const uno::Any& Element ) - throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -121,7 +121,7 @@ void SAL_CALL SdXCustomPresentation::insertByIndex( sal_Int32 Index, const uno:: } void SAL_CALL SdXCustomPresentation::removeByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -154,7 +154,7 @@ void SAL_CALL SdXCustomPresentation::removeByIndex( sal_Int32 Index ) // XIndexReplace void SAL_CALL SdXCustomPresentation::replaceByIndex( sal_Int32 Index, const uno::Any& Element ) - throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByIndex( Index ); insertByIndex( Index, Element ); @@ -162,13 +162,13 @@ void SAL_CALL SdXCustomPresentation::replaceByIndex( sal_Int32 Index, const uno: // XElementAccess uno::Type SAL_CALL SdXCustomPresentation::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::UnoType<drawing::XDrawPage>::get(); } sal_Bool SAL_CALL SdXCustomPresentation::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -180,7 +180,7 @@ sal_Bool SAL_CALL SdXCustomPresentation::hasElements() // XIndexAccess sal_Int32 SAL_CALL SdXCustomPresentation::getCount() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( bDisposing ) @@ -190,7 +190,7 @@ sal_Int32 SAL_CALL SdXCustomPresentation::getCount() } uno::Any SAL_CALL SdXCustomPresentation::getByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -217,7 +217,7 @@ uno::Any SAL_CALL SdXCustomPresentation::getByIndex( sal_Int32 Index ) // XNamed OUString SAL_CALL SdXCustomPresentation::getName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -231,7 +231,7 @@ OUString SAL_CALL SdXCustomPresentation::getName() } void SAL_CALL SdXCustomPresentation::setName( const OUString& aName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -243,7 +243,7 @@ void SAL_CALL SdXCustomPresentation::setName( const OUString& aName ) } // XComponent -void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException) +void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -263,7 +263,7 @@ void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException) void SAL_CALL SdXCustomPresentation::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( bDisposing ) throw lang::DisposedException(); @@ -272,7 +272,7 @@ void SAL_CALL SdXCustomPresentation::addEventListener( const uno::Reference< lan } -void SAL_CALL SdXCustomPresentation::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException) +void SAL_CALL SdXCustomPresentation::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException, std::exception) { if( !bDisposing ) aDisposeListeners.removeInterface(aListener); @@ -294,19 +294,19 @@ SdXCustomPresentationAccess::~SdXCustomPresentationAccess() throw() // XServiceInfo OUString SAL_CALL SdXCustomPresentationAccess::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString( "SdXCustomPresentationAccess" ); } sal_Bool SAL_CALL SdXCustomPresentationAccess::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { const OUString aNS( "com.sun.star.presentation.CustomPresentationAccess" ); uno::Sequence< OUString > aSeq( &aNS, 1 ); @@ -315,21 +315,21 @@ uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getSupportedServ // XSingleServiceFactory uno::Reference< uno::XInterface > SAL_CALL SdXCustomPresentationAccess::createInstance() - throw(uno::Exception, uno::RuntimeException) + throw(uno::Exception, uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xRef( (::cppu::OWeakObject*)new SdXCustomPresentation() ); return xRef; } uno::Reference< uno::XInterface > SAL_CALL SdXCustomPresentationAccess::createInstanceWithArguments( const uno::Sequence< uno::Any >& ) - throw(uno::Exception, uno::RuntimeException) + throw(uno::Exception, uno::RuntimeException, std::exception) { return createInstance(); } // XNameContainer void SAL_CALL SdXCustomPresentationAccess::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -383,7 +383,7 @@ void SAL_CALL SdXCustomPresentationAccess::insertByName( const OUString& aName, } void SAL_CALL SdXCustomPresentationAccess::removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -400,7 +400,7 @@ void SAL_CALL SdXCustomPresentationAccess::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL SdXCustomPresentationAccess::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByName( aName ); insertByName( aName, aElement ); @@ -408,7 +408,7 @@ void SAL_CALL SdXCustomPresentationAccess::replaceByName( const OUString& aName, // XNameAccess uno::Any SAL_CALL SdXCustomPresentationAccess::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -429,7 +429,7 @@ uno::Any SAL_CALL SdXCustomPresentationAccess::getByName( const OUString& aName } uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getElementNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -452,7 +452,7 @@ uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getElementNames( sal_Bool SAL_CALL SdXCustomPresentationAccess::hasByName( const OUString& aName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return getSdCustomShow(aName) != NULL; @@ -460,13 +460,13 @@ sal_Bool SAL_CALL SdXCustomPresentationAccess::hasByName( const OUString& aName // XElementAccess uno::Type SAL_CALL SdXCustomPresentationAccess::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::UnoType<container::XIndexContainer>::get(); } sal_Bool SAL_CALL SdXCustomPresentationAccess::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; |