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/unoobj.cxx | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'sd/source/ui/unoidl/unoobj.cxx')
-rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index b18e8d0d0cc4..75c997f5f23d 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -326,7 +326,7 @@ uno::Any SAL_CALL SdXShape::queryAggregation( const uno::Type & rType ) } uno::Any SAL_CALL SdXShape::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return mpShape->queryInterface( rType ); } @@ -1159,25 +1159,25 @@ public: SdUnoEventsAccess( SdXShape* pShape ) throw(); // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; // XEventsSupplier -uno::Reference< container::XNameReplace > SAL_CALL SdXShape::getEvents( ) throw(::com::sun::star::uno::RuntimeException) +uno::Reference< container::XNameReplace > SAL_CALL SdXShape::getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return new SdUnoEventsAccess( this ); } @@ -1226,7 +1226,7 @@ static void clearEventsInAnimationInfo( SdAnimationInfo* pInfo ) // XNameReplace void SAL_CALL SdUnoEventsAccess::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) { if( mpShape == NULL || aName != maStrOnClick ) throw container::NoSuchElementException(); @@ -1499,7 +1499,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno // XNameAccess uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( mpShape == NULL || aName != maStrOnClick ) throw container::NoSuchElementException(); @@ -1710,45 +1710,45 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL SdUnoEventsAccess::getElementNames( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aStr( &maStrOnClick, 1 ); return aStr; } sal_Bool SAL_CALL SdUnoEventsAccess::hasByName( const OUString& aName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return aName == maStrOnClick; } // XElementAccess uno::Type SAL_CALL SdUnoEventsAccess::getElementType( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return ::getCppuType((const uno::Sequence< beans::PropertyValue >*)0); } -sal_Bool SAL_CALL SdUnoEventsAccess::hasElements( ) throw(uno::RuntimeException) +sal_Bool SAL_CALL SdUnoEventsAccess::hasElements( ) throw(uno::RuntimeException, std::exception) { return sal_True; } // XServiceInfo OUString SAL_CALL SdUnoEventsAccess::getImplementationName( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString( "SdUnoEventsAccess" ); } sal_Bool SAL_CALL SdUnoEventsAccess::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL SdUnoEventsAccess::getSupportedServiceNames( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aStr( &maStrServiceName, 1 ); return aStr; |