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 /dtrans | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'dtrans')
-rw-r--r-- | dtrans/source/cnttype/mcnttfactory.cxx | 8 | ||||
-rw-r--r-- | dtrans/source/cnttype/mcnttfactory.hxx | 8 | ||||
-rw-r--r-- | dtrans/source/cnttype/mcnttype.cxx | 12 | ||||
-rw-r--r-- | dtrans/source/cnttype/mcnttype.hxx | 12 |
4 files changed, 20 insertions, 20 deletions
diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx index e1bfc96dbdfc..3e1c016ae5c5 100644 --- a/dtrans/source/cnttype/mcnttfactory.cxx +++ b/dtrans/source/cnttype/mcnttfactory.cxx @@ -54,7 +54,7 @@ CMimeContentTypeFactory::CMimeContentTypeFactory() // createMimeContentType Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( const OUString& aContentType ) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { MutexGuard aGuard( m_aMutex ); return Reference< XMimeContentType >( new CMimeContentType( aContentType ) ); @@ -63,14 +63,14 @@ Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( co // XServiceInfo OUString SAL_CALL CMimeContentTypeFactory::getImplementationName( ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return OUString( MIMECONTENTTYPEFACTORY_IMPL_NAME ); } // XServiceInfo sal_Bool SAL_CALL CMimeContentTypeFactory::supportsService( const OUString& ServiceName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } @@ -78,7 +78,7 @@ sal_Bool SAL_CALL CMimeContentTypeFactory::supportsService( const OUString& Serv // XServiceInfo Sequence< OUString > SAL_CALL CMimeContentTypeFactory::getSupportedServiceNames( ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return MimeContentTypeFactory_getSupportedServiceNames( ); } diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx index 2d2908ed2b4f..ba9a2f2cb5d7 100644 --- a/dtrans/source/cnttype/mcnttfactory.hxx +++ b/dtrans/source/cnttype/mcnttfactory.hxx @@ -37,18 +37,18 @@ public: // XMimeContentTypeFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const OUString& aContentType ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); private: ::osl::Mutex m_aMutex; diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx index c05d57488519..e859ffba0025 100644 --- a/dtrans/source/cnttype/mcnttype.cxx +++ b/dtrans/source/cnttype/mcnttype.cxx @@ -41,22 +41,22 @@ CMimeContentType::CMimeContentType( const OUString& aCntType ) init( aCntType ); } -OUString SAL_CALL CMimeContentType::getMediaType( ) throw(RuntimeException) +OUString SAL_CALL CMimeContentType::getMediaType( ) throw(RuntimeException, std::exception) { return m_MediaType; } -OUString SAL_CALL CMimeContentType::getMediaSubtype( ) throw(RuntimeException) +OUString SAL_CALL CMimeContentType::getMediaSubtype( ) throw(RuntimeException, std::exception) { return m_MediaSubtype; } -OUString SAL_CALL CMimeContentType::getFullMediaType( ) throw(RuntimeException) +OUString SAL_CALL CMimeContentType::getFullMediaType( ) throw(RuntimeException, std::exception) { return m_MediaType + "/" + m_MediaSubtype; } -Sequence< OUString > SAL_CALL CMimeContentType::getParameters( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL CMimeContentType::getParameters( ) throw(RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); @@ -74,13 +74,13 @@ Sequence< OUString > SAL_CALL CMimeContentType::getParameters( ) throw(RuntimeEx return seqParams; } -sal_Bool SAL_CALL CMimeContentType::hasParameter( const OUString& aName ) throw(RuntimeException) +sal_Bool SAL_CALL CMimeContentType::hasParameter( const OUString& aName ) throw(RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); return ( m_ParameterMap.end( ) != m_ParameterMap.find( aName ) ); } -OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName ) throw(NoSuchElementException, RuntimeException) +OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName ) throw(NoSuchElementException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx index 5f1d0435becd..37441d5d8c88 100644 --- a/dtrans/source/cnttype/mcnttype.hxx +++ b/dtrans/source/cnttype/mcnttype.hxx @@ -36,18 +36,18 @@ public: // XMimeContentType - virtual OUString SAL_CALL getMediaType( ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getMediaSubtype( ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getFullMediaType( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getMediaType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getMediaSubtype( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getFullMediaType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getParameters( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasParameter( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getParameterValue( const OUString& aName ) - throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); private: void SAL_CALL init( const OUString& aCntType ) throw( com::sun::star::lang::IllegalArgumentException ); |