diff options
Diffstat (limited to 'ucb/source/ucp/cmis')
-rw-r--r-- | ucb/source/ucp/cmis/cmis_content.cxx | 27 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_content.hxx | 63 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_datasupplier.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_datasupplier.hxx | 3 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_provider.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_provider.hxx | 22 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_repo_content.cxx | 11 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_repo_content.hxx | 24 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/std_inputstream.cxx | 13 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/std_inputstream.hxx | 43 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/std_outputstream.cxx | 8 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/std_outputstream.hxx | 25 |
12 files changed, 66 insertions, 179 deletions
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 65ba37d484fd..7d0ab609edce 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -287,7 +287,6 @@ namespace cmis Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, ContentProvider *pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier, libcmis::ObjectPtr const & pObject ) - throw ( ucb::ContentCreationException ) : ContentImplHelper( rxContext, pProvider, Identifier ), m_pProvider( pProvider ), m_pSession( nullptr ), @@ -306,7 +305,6 @@ namespace cmis Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, ContentProvider *pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier, bool bIsFolder ) - throw ( ucb::ContentCreationException ) : ContentImplHelper( rxContext, pProvider, Identifier ), m_pProvider( pProvider ), m_pSession( nullptr ), @@ -497,7 +495,7 @@ namespace cmis } - libcmis::ObjectPtr const & Content::getObject( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception) + libcmis::ObjectPtr const & Content::getObject( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) { // can't get the session for some reason // the recent file opening at start up is an example. @@ -974,7 +972,6 @@ namespace cmis uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, libcmis::Exception ) { bool bIsFolder = isFolder( xEnv ); @@ -1042,7 +1039,6 @@ namespace cmis OUString Content::checkIn( const ucb::CheckinArgument& rArg, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception ) { ucbhelper::Content aSourceContent( rArg.SourceURL, xEnv, comphelper::getProcessComponentContext( ) ); uno::Reference< io::XInputStream > xIn = aSourceContent.openStream( ); @@ -1113,7 +1109,6 @@ namespace cmis } OUString Content::checkOut( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception ) { OUString aRet; try @@ -1160,7 +1155,6 @@ namespace cmis } OUString Content::cancelCheckOut( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception ) { OUString aRet; try @@ -1226,7 +1220,6 @@ namespace cmis } uno::Sequence< document::CmisVersion> Content::getAllVersions( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, std::exception ) { try { @@ -1268,7 +1261,6 @@ namespace cmis void Content::transfer( const ucb::TransferInfo& rTransferInfo, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception ) { // If the source isn't on the same CMIS repository, then simply copy INetURLObject aSourceUrl( rTransferInfo.SourceURL ); @@ -1292,7 +1284,6 @@ namespace cmis void Content::insert( const uno::Reference< io::XInputStream > & xInputStream, bool bReplaceExisting, const OUString& rMimeType, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw (uno::Exception, std::exception) { if ( !xInputStream.is() ) { @@ -1736,25 +1727,24 @@ namespace cmis ContentImplHelper::release(); } - uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException, std::exception ) + uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) { uno::Any aRet = cppu::queryInterface( rType, static_cast< ucb::XContentCreator * >( this ) ); return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface(rType); } - OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL Content::getImplementationName() { return OUString("com.sun.star.comp.CmisContent"); } uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.ucb.CmisContent" }; return aSNS; } - OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL Content::getContentType() { OUString sRet; try @@ -1781,7 +1771,6 @@ namespace cmis const ucb::Command& aCommand, sal_Int32 /*CommandId*/, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception, ucb::CommandAbortedException, uno::RuntimeException, std::exception ) { SAL_INFO( "ucb.ucp.cmis", "Content::execute( ) - " << aCommand.Name ); uno::Any aRet; @@ -1906,20 +1895,19 @@ namespace cmis return aRet; } - void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) throw( uno::RuntimeException, std::exception ) + void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) { SAL_INFO( "ucb.ucp.cmis", "TODO - Content::abort()" ); // TODO Implement me } uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() - throw( uno::RuntimeException, std::exception ) { return queryCreatableContentsInfo( uno::Reference< ucb::XCommandEnvironment >() ); } uno::Reference< ucb::XContent > SAL_CALL Content::createNewContent( - const ucb::ContentInfo& Info ) throw( uno::RuntimeException, std::exception ) + const ucb::ContentInfo& Info ) { bool create_document; @@ -1949,7 +1937,7 @@ namespace cmis } } - uno::Sequence< uno::Type > SAL_CALL Content::getTypes() throw( uno::RuntimeException, std::exception ) + uno::Sequence< uno::Type > SAL_CALL Content::getTypes() { try { @@ -1999,7 +1987,6 @@ namespace cmis uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo( const uno::Reference< ucb::XCommandEnvironment >& xEnv) - throw( uno::RuntimeException ) { try { diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx index d7b1aec656f9..270a232ed556 100644 --- a/ucb/source/ucp/cmis/cmis_content.hxx +++ b/ucb/source/ucp/cmis/cmis_content.hxx @@ -89,32 +89,26 @@ private: /// @throws css::uno::Exception /// @throws libcmis::Exception css::uno::Any open(const css::ucb::OpenCommandArgument2 & rArg, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, libcmis::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception void transfer( const css::ucb::TransferInfo& rTransferInfo, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream, bool bReplaceExisting, const OUString & rMimeType, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw (css::uno::Exception, std::exception); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws css::uno::Exception OUString checkIn( const css::ucb::CheckinArgument& rArg, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception - OUString checkOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception ); + OUString checkOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception - OUString cancelCheckOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception ); + OUString cancelCheckOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); static void copyData( const css::uno::Reference< css::io::XInputStream >& xIn, const css::uno::Reference< css::io::XOutputStream >& xOut ); @@ -125,9 +119,7 @@ private: /// @throws css::uno::Exception css::uno::Sequence< css::document::CmisVersion > - getAllVersions( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw(css::uno::Exception, - std::exception); + getAllVersions( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); bool feedSink( const css::uno::Reference< css::uno::XInterface>& aSink, const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); @@ -137,15 +129,13 @@ public: Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider *pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - libcmis::ObjectPtr const & pObject = libcmis::ObjectPtr( ) ) - throw ( css::ucb::ContentCreationException ); + libcmis::ObjectPtr const & pObject = libcmis::ObjectPtr( ) ); /// @throws css::ucb::ContentCreationException Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider *pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - bool bIsFolder) - throw ( css::ucb::ContentCreationException ); + bool bIsFolder); virtual ~Content() override; @@ -162,58 +152,47 @@ public: virtual OUString getParentURL() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; virtual OUString SAL_CALL - getContentType() - throw( css::uno::RuntimeException, std::exception ) override; + getContentType() override; virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override; - virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL abort( sal_Int32 CommandId ) override; virtual css::uno::Sequence< css::ucb::ContentInfo > - SAL_CALL queryCreatableContentsInfo() - throw( css::uno::RuntimeException, std::exception ) override; + SAL_CALL queryCreatableContentsInfo() override; virtual css::uno::Reference< css::ucb::XContent > - SAL_CALL createNewContent( const css::ucb::ContentInfo& Info ) - throw( css::uno::RuntimeException, std::exception ) override; + SAL_CALL createNewContent( const css::ucb::ContentInfo& Info ) override; /// @throws css::uno::RuntimeException css::uno::Sequence< css::ucb::ContentInfo > - queryCreatableContentsInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw( css::uno::RuntimeException ); + queryCreatableContentsInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); virtual std::list< css::uno::Reference< css::ucb::XContent > > getChildren( ) override; /// @throws css::uno::RuntimeException /// @throws css::ucb::CommandFailedException /// @throws libcmis::Exception - libcmis::ObjectPtr const & getObject( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception); + libcmis::ObjectPtr const & getObject( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); }; } diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx b/ucb/source/ucp/cmis/cmis_datasupplier.cxx index 14b3385ec712..9f9fbae0cb0b 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx @@ -166,7 +166,7 @@ namespace cmis { } - void DataSupplier::validate() throw( ucb::ResultSetException ) + void DataSupplier::validate() { } diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx index 2e3dd1ba272b..619af90e355c 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx @@ -65,8 +65,7 @@ namespace cmis virtual void close() override; - virtual void validate() - throw( css::ucb::ResultSetException ) override; + virtual void validate() override; }; } diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index a022c44a2d3e..a906ac609d6f 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -23,8 +23,6 @@ namespace cmis uno::Reference< css::ucb::XContent > SAL_CALL ContentProvider::queryContent( const uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -103,7 +101,6 @@ void SAL_CALL ContentProvider::release() } css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -123,7 +120,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) )); diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx index 3915c0664e81..cfca2923de13 100644 --- a/ucb/source/ucp/cmis/cmis_provider.hxx +++ b/ucb/source/ucp/cmis/cmis_provider.hxx @@ -27,26 +27,20 @@ public: virtual ~ContentProvider() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -57,9 +51,7 @@ public: // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - css::uno::RuntimeException, std::exception ) override; + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; libcmis::Session* getSession( const OUString& sBindingUrl, const OUString& sUsername ); void registerSession( const OUString& sBindingUrl, const OUString& sUsername, libcmis::Session* pSession ); diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index b0726898cae7..a1a4bd0bedcd 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -50,7 +50,6 @@ namespace cmis RepoContent::RepoContent( const uno::Reference< uno::XComponentContext >& rxContext, ContentProvider *pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier, vector< libcmis::RepositoryPtr > const & aRepos ) - throw ( ucb::ContentCreationException ) : ContentImplHelper( rxContext, pProvider, Identifier ), m_pProvider( pProvider ), m_aURL( Identifier->getContentIdentifier( ) ), @@ -320,19 +319,18 @@ namespace cmis XTYPEPROVIDER_COMMON_IMPL( RepoContent ); - OUString SAL_CALL RepoContent::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL RepoContent::getImplementationName() { return OUString("com.sun.star.comp.CmisRepoContent"); } uno::Sequence< OUString > SAL_CALL RepoContent::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.ucb.Content" }; return aSNS; } - OUString SAL_CALL RepoContent::getContentType() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL RepoContent::getContentType() { return OUString( CMIS_REPO_TYPE ); } @@ -341,7 +339,6 @@ namespace cmis const ucb::Command& aCommand, sal_Int32 /*CommandId*/, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception, ucb::CommandAbortedException, uno::RuntimeException, std::exception ) { SAL_INFO( "ucb.ucp.cmis", "RepoContent::execute( ) - " << aCommand.Name ); @@ -378,13 +375,13 @@ namespace cmis return aRet; } - void SAL_CALL RepoContent::abort( sal_Int32 /*CommandId*/ ) throw( uno::RuntimeException, std::exception ) + void SAL_CALL RepoContent::abort( sal_Int32 /*CommandId*/ ) { SAL_INFO( "ucb.ucp.cmis", "TODO - RepoContent::abort()" ); // TODO Implement me } - uno::Sequence< uno::Type > SAL_CALL RepoContent::getTypes() throw( uno::RuntimeException, std::exception ) + uno::Sequence< uno::Type > SAL_CALL RepoContent::getTypes() { static cppu::OTypeCollection aFolderCollection (CPPU_TYPE_REF( lang::XTypeProvider ), diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx index ba5f18154481..4be969ee1c24 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.hxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx @@ -76,8 +76,7 @@ public: RepoContent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider *pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - std::vector< libcmis::RepositoryPtr > const & aRepos = std::vector< libcmis::RepositoryPtr > ( ) ) - throw ( css::ucb::ContentCreationException ); + std::vector< libcmis::RepositoryPtr > const & aRepos = std::vector< libcmis::RepositoryPtr > ( ) ); virtual ~RepoContent() override; @@ -91,31 +90,24 @@ public: // XInterface - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; virtual OUString SAL_CALL - getContentType() - throw( css::uno::RuntimeException, std::exception ) override; + getContentType() override; virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override; - virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL abort( sal_Int32 CommandId ) override; virtual std::list< css::uno::Reference< css::ucb::XContent > > getChildren( ) override; }; diff --git a/ucb/source/ucp/cmis/std_inputstream.cxx b/ucb/source/ucp/cmis/std_inputstream.cxx index 4a6b1c468d34..18f850545fc5 100644 --- a/ucb/source/ucp/cmis/std_inputstream.cxx +++ b/ucb/source/ucp/cmis/std_inputstream.cxx @@ -37,7 +37,7 @@ namespace cmis { } - uno::Any SAL_CALL StdInputStream::queryInterface( const uno::Type& rType ) throw ( uno::RuntimeException, std::exception ) + uno::Any SAL_CALL StdInputStream::queryInterface( const uno::Type& rType ) { uno::Any aRet = ::cppu::queryInterface( rType, ( static_cast< XInputStream* >( this ) ), @@ -57,8 +57,6 @@ namespace cmis } sal_Int32 SAL_CALL StdInputStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( m_aMutex ); @@ -85,8 +83,6 @@ namespace cmis sal_Int32 SAL_CALL StdInputStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( m_aMutex ); @@ -110,8 +106,6 @@ namespace cmis } void SAL_CALL StdInputStream::skipBytes( sal_Int32 nBytesToSkip ) - throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -130,19 +124,16 @@ namespace cmis } sal_Int32 SAL_CALL StdInputStream::available( ) - throw(io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception ) { return sal::static_int_cast< sal_Int32 >( m_nLength - getPosition() ); } void SAL_CALL StdInputStream::closeInput( ) - throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) { // No need to implement this for an istream } void SAL_CALL StdInputStream::seek( sal_Int64 location ) - throw( lang::IllegalArgumentException, io::IOException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -167,7 +158,6 @@ namespace cmis } sal_Int64 SAL_CALL StdInputStream::getPosition( ) - throw( io::IOException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -182,7 +172,6 @@ namespace cmis } sal_Int64 SAL_CALL StdInputStream::getLength( ) - throw ( io::IOException, uno::RuntimeException, std::exception ) { return m_nLength; } diff --git a/ucb/source/ucp/cmis/std_inputstream.hxx b/ucb/source/ucp/cmis/std_inputstream.hxx index ba7338c76375..40596a33787a 100644 --- a/ucb/source/ucp/cmis/std_inputstream.hxx +++ b/ucb/source/ucp/cmis/std_inputstream.hxx @@ -36,8 +36,7 @@ namespace cmis virtual ~StdInputStream() override; - virtual css::uno::Any SAL_CALL queryInterface ( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface ( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire( ) throw ( ) override; @@ -45,59 +44,35 @@ namespace cmis virtual sal_Int32 SAL_CALL readBytes ( css::uno::Sequence< sal_Int8 >& aData, - sal_Int32 nBytesToRead ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nBytesToRead ) override; virtual sal_Int32 SAL_CALL readSomeBytes ( css::uno::Sequence< sal_Int8 >& aData, - sal_Int32 nMaxBytesToRead ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nMaxBytesToRead ) override; virtual void SAL_CALL - skipBytes ( sal_Int32 nBytesToSkip ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + skipBytes ( sal_Int32 nBytesToSkip ) override; virtual sal_Int32 SAL_CALL - available ( ) - throw ( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + available ( ) override; virtual void SAL_CALL - closeInput ( ) - throw ( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + closeInput ( ) override; /** XSeekable */ virtual void SAL_CALL - seek ( sal_Int64 location ) - throw ( css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + seek ( sal_Int64 location ) override; virtual sal_Int64 SAL_CALL - getPosition ( ) - throw ( css::io::IOException, css::uno::RuntimeException, std::exception ) override; + getPosition ( ) override; virtual sal_Int64 SAL_CALL - getLength ( ) - throw ( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + getLength ( ) override; private: diff --git a/ucb/source/ucp/cmis/std_outputstream.cxx b/ucb/source/ucp/cmis/std_outputstream.cxx index c26f0ef30885..1cd4ec13350c 100644 --- a/ucb/source/ucp/cmis/std_outputstream.cxx +++ b/ucb/source/ucp/cmis/std_outputstream.cxx @@ -29,7 +29,7 @@ namespace cmis m_pStream->setstate( ios::eofbit ); } - uno::Any SAL_CALL StdOutputStream::queryInterface( const uno::Type& rType ) throw ( uno::RuntimeException, std::exception ) + uno::Any SAL_CALL StdOutputStream::queryInterface( const uno::Type& rType ) { uno::Any aRet = ::cppu::queryInterface( rType, ( static_cast< XOutputStream* >( this ) ) ); @@ -47,8 +47,6 @@ namespace cmis } void SAL_CALL StdOutputStream::writeBytes ( const uno::Sequence< sal_Int8 >& aData ) - throw ( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -67,8 +65,6 @@ namespace cmis } void SAL_CALL StdOutputStream::flush ( ) - throw ( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -87,8 +83,6 @@ namespace cmis } void SAL_CALL StdOutputStream::closeOutput ( ) - throw ( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/cmis/std_outputstream.hxx b/ucb/source/ucp/cmis/std_outputstream.hxx index 1521bbd211db..574948c7a546 100644 --- a/ucb/source/ucp/cmis/std_outputstream.hxx +++ b/ucb/source/ucp/cmis/std_outputstream.hxx @@ -33,30 +33,17 @@ namespace cmis virtual ~StdOutputStream( ) override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire ( ) throw ( ) override; virtual void SAL_CALL release ( ) throw ( ) override; - virtual void SAL_CALL writeBytes ( const css::uno::Sequence< sal_Int8 >& aData ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL flush ( ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL closeOutput ( ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL writeBytes ( const css::uno::Sequence< sal_Int8 >& aData ) override; + + virtual void SAL_CALL flush ( ) override; + + virtual void SAL_CALL closeOutput ( ) override; private: |