diff options
Diffstat (limited to 'ucb/source/ucp/file')
-rw-r--r-- | ucb/source/ucp/file/bc.cxx | 35 | ||||
-rw-r--r-- | ucb/source/ucp/file/bc.hxx | 94 | ||||
-rw-r--r-- | ucb/source/ucp/file/filcmd.cxx | 8 | ||||
-rw-r--r-- | ucb/source/ucp/file/filcmd.hxx | 20 | ||||
-rw-r--r-- | ucb/source/ucp/file/filid.cxx | 5 | ||||
-rw-r--r-- | ucb/source/ucp/file/filid.hxx | 15 | ||||
-rw-r--r-- | ucb/source/ucp/file/filinpstr.cxx | 26 | ||||
-rw-r--r-- | ucb/source/ucp/file/filinpstr.hxx | 50 | ||||
-rw-r--r-- | ucb/source/ucp/file/filinsreq.hxx | 9 | ||||
-rw-r--r-- | ucb/source/ucp/file/filprp.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/file/filprp.hxx | 10 | ||||
-rw-r--r-- | ucb/source/ucp/file/filrow.cxx | 40 | ||||
-rw-r--r-- | ucb/source/ucp/file/filrow.hxx | 81 | ||||
-rw-r--r-- | ucb/source/ucp/file/filrset.cxx | 79 | ||||
-rw-r--r-- | ucb/source/ucp/file/filrset.hxx | 239 | ||||
-rw-r--r-- | ucb/source/ucp/file/filstr.cxx | 43 | ||||
-rw-r--r-- | ucb/source/ucp/file/filstr.hxx | 78 | ||||
-rw-r--r-- | ucb/source/ucp/file/filtask.cxx | 7 | ||||
-rw-r--r-- | ucb/source/ucp/file/filtask.hxx | 13 | ||||
-rw-r--r-- | ucb/source/ucp/file/prov.cxx | 50 | ||||
-rw-r--r-- | ucb/source/ucp/file/prov.hxx | 66 |
21 files changed, 176 insertions, 796 deletions
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index bafc57cab2d9..6f45334bc53f 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -153,7 +153,6 @@ BaseContent::release() Any SAL_CALL BaseContent::queryInterface( const Type& rType ) - throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, (static_cast< lang::XComponent* >(this)), @@ -175,7 +174,6 @@ BaseContent::queryInterface( const Type& rType ) void SAL_CALL BaseContent::addEventListener( const Reference< lang::XEventListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -189,7 +187,6 @@ BaseContent::addEventListener( const Reference< lang::XEventListener >& Listener void SAL_CALL BaseContent::removeEventListener( const Reference< lang::XEventListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -200,7 +197,6 @@ BaseContent::removeEventListener( const Reference< lang::XEventListener >& Liste void SAL_CALL BaseContent::dispose() - throw( RuntimeException, std::exception ) { lang::EventObject aEvt; comphelper::OInterfaceContainerHelper2* pDisposeEventListeners; @@ -247,21 +243,18 @@ BaseContent::dispose() // XServiceInfo OUString SAL_CALL BaseContent::getImplementationName() - throw( RuntimeException, std::exception) { return OUString("com.sun.star.comp.ucb.FileContent"); } sal_Bool SAL_CALL BaseContent::supportsService( const OUString& ServiceName ) - throw( RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } Sequence< OUString > SAL_CALL BaseContent::getSupportedServiceNames() - throw( RuntimeException, std::exception ) { Sequence<OUString> ret { "com.sun.star.ucb.FileContent" }; return ret; @@ -286,7 +279,6 @@ XTYPEPROVIDER_IMPL_10( BaseContent, sal_Int32 SAL_CALL BaseContent::createCommandIdentifier() - throw( RuntimeException, std::exception ) { return m_pMyShell->getCommandId(); } @@ -294,7 +286,6 @@ BaseContent::createCommandIdentifier() void SAL_CALL BaseContent::abort( sal_Int32 CommandId ) - throw( RuntimeException, std::exception ) { m_pMyShell->abort( CommandId ); } @@ -304,9 +295,6 @@ Any SAL_CALL BaseContent::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) - throw( Exception, - CommandAbortedException, - RuntimeException, std::exception ) { if( ! CommandId ) // A Command with commandid zero cannot be aborted @@ -423,7 +411,6 @@ void SAL_CALL BaseContent::addPropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< beans::XPropertiesChangeListener >& Listener ) - throw( RuntimeException, std::exception ) { if( ! Listener.is() ) return; @@ -449,7 +436,6 @@ BaseContent::addPropertiesChangeListener( void SAL_CALL BaseContent::removePropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< beans::XPropertiesChangeListener >& Listener ) - throw( RuntimeException, std::exception ) { if( ! Listener.is() ) return; @@ -471,7 +457,6 @@ BaseContent::removePropertiesChangeListener( const Sequence< OUString >& Propert Reference< ucb::XContentIdentifier > SAL_CALL BaseContent::getIdentifier() - throw( RuntimeException, std::exception ) { return m_xContentIdentifier; } @@ -479,7 +464,6 @@ BaseContent::getIdentifier() OUString SAL_CALL BaseContent::getContentType() - throw( RuntimeException, std::exception ) { if( !( m_nState & Deleted ) ) { @@ -529,7 +513,6 @@ BaseContent::getContentType() void SAL_CALL BaseContent::addContentEventListener( const Reference< XContentEventListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -545,7 +528,6 @@ BaseContent::addContentEventListener( void SAL_CALL BaseContent::removeContentEventListener( const Reference< XContentEventListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -562,10 +544,6 @@ BaseContent::addProperty( const OUString& Name, sal_Int16 Attributes, const Any& DefaultValue ) - throw( beans::PropertyExistException, - beans::IllegalTypeException, - lang::IllegalArgumentException, - RuntimeException, std::exception) { if( ( m_nState & JustInserted ) || ( m_nState & Deleted ) || Name.isEmpty() ) { @@ -578,9 +556,6 @@ BaseContent::addProperty( void SAL_CALL BaseContent::removeProperty( const OUString& Name ) - throw( beans::UnknownPropertyException, - beans::NotRemoveableException, - RuntimeException, std::exception) { if( m_nState & Deleted ) @@ -595,7 +570,6 @@ BaseContent::removeProperty( const OUString& Name ) Sequence< ContentInfo > SAL_CALL BaseContent::queryCreatableContentsInfo() - throw( RuntimeException, std::exception ) { return m_pMyShell->queryCreatableContentsInfo(); } @@ -603,7 +577,6 @@ BaseContent::queryCreatableContentsInfo() Reference< XContent > SAL_CALL BaseContent::createNewContent( const ContentInfo& Info ) - throw( RuntimeException, std::exception ) { // Check type. if ( Info.Type.isEmpty() ) @@ -666,7 +639,6 @@ BaseContent::createNewContent( const ContentInfo& Info ) void SAL_CALL BaseContent::addPropertySetInfoChangeListener( const Reference< beans::XPropertySetInfoChangeListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); if( ! m_pPropertySetInfoChangeListeners ) @@ -679,7 +651,6 @@ BaseContent::addPropertySetInfoChangeListener( void SAL_CALL BaseContent::removePropertySetInfoChangeListener( const Reference< beans::XPropertySetInfoChangeListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -693,7 +664,6 @@ BaseContent::removePropertySetInfoChangeListener( Reference< XInterface > SAL_CALL BaseContent::getParent() - throw( RuntimeException, std::exception ) { OUString ParentUnq = getParentName( m_aUncPath ); OUString ParentUrl; @@ -720,8 +690,6 @@ BaseContent::getParent() void SAL_CALL BaseContent::setParent( const Reference< XInterface >& ) - throw( lang::NoSupportException, - RuntimeException, std::exception) { throw lang::NoSupportException( THROW_WHERE ); } @@ -732,7 +700,6 @@ BaseContent::setParent( Reference< XCommandInfo > SAL_CALL BaseContent::getCommandInfo() - throw( RuntimeException ) { if( m_nState & Deleted ) return Reference< XCommandInfo >(); @@ -744,7 +711,6 @@ BaseContent::getCommandInfo() Reference< beans::XPropertySetInfo > SAL_CALL BaseContent::getPropertySetInfo( sal_Int32 ) - throw( RuntimeException ) { if( m_nState & Deleted ) return Reference< beans::XPropertySetInfo >(); @@ -756,7 +722,6 @@ Reference< sdbc::XRow > SAL_CALL BaseContent::getPropertyValues( sal_Int32 nMyCommandIdentifier, const Sequence< beans::Property >& PropertySet ) - throw( RuntimeException, std::exception ) { sal_Int32 nProps = PropertySet.getLength(); if ( !nProps ) diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx index 75ebdbd0cd9b..e6d82ad6f393 100644 --- a/ucb/source/ucp/file/bc.hxx +++ b/ucb/source/ucp/file/bc.hxx @@ -88,8 +88,7 @@ namespace fileaccess { // XInterface virtual css::uno::Any SAL_CALL - queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception) override; + queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() @@ -102,91 +101,72 @@ namespace fileaccess { // XComponent virtual void SAL_CALL - dispose() - throw( css::uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL addEventListener( - const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw( css::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) 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; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // XCommandProcessor virtual sal_Int32 SAL_CALL - createCommandIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + createCommandIdentifier() 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; + abort( sal_Int32 CommandId ) override; // XContent virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL - getIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + getIdentifier() override; virtual OUString SAL_CALL - getContentType() - throw( css::uno::RuntimeException, std::exception ) override; + getContentType() override; virtual void SAL_CALL addContentEventListener( - const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) override; virtual void SAL_CALL removeContentEventListener( - const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) override; // XPropertiesChangeNotifier virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames, - const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) override; virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames, - const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) override; // XPropertyContainer @@ -194,51 +174,38 @@ namespace fileaccess { addProperty( const OUString& Name, sal_Int16 Attributes, - const css::uno::Any& DefaultValue ) - throw( css::beans::PropertyExistException, - css::beans::IllegalTypeException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& DefaultValue ) override; virtual void SAL_CALL - removeProperty( const OUString& Name ) - throw( css::beans::UnknownPropertyException, - css::beans::NotRemoveableException, - css::uno::RuntimeException, std::exception ) override; + removeProperty( const OUString& Name ) override; // XPropertySetInfoChangeNotifier virtual void SAL_CALL addPropertySetInfoChangeListener( - const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override; virtual void SAL_CALL removePropertySetInfoChangeListener( - const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override; // XContentCreator virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL - queryCreatableContentsInfo() - throw( css::uno::RuntimeException, std::exception ) override; + queryCreatableContentsInfo() override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - createNewContent( const css::ucb::ContentInfo& Info ) - throw( css::uno::RuntimeException, std::exception ) override; + createNewContent( const css::ucb::ContentInfo& Info ) override; // XChild virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - getParent() throw( css::uno::RuntimeException, std::exception ) override; + getParent() override; // Not supported virtual void SAL_CALL - setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) - throw( css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override; // Notifier @@ -274,21 +241,18 @@ namespace fileaccess { // Private Methods /// @throws css::uno::RuntimeException css::uno::Reference< css::ucb::XCommandInfo > SAL_CALL - getCommandInfo() - throw( css::uno::RuntimeException ); + getCommandInfo(); /// @throws css::uno::RuntimeException css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( - sal_Int32 nMyCommandIdentifier ) - throw( css::uno::RuntimeException ); + sal_Int32 nMyCommandIdentifier ); /// @throws css::uno::RuntimeException css::uno::Reference< css::sdbc::XRow > SAL_CALL getPropertyValues( sal_Int32 nMyCommandIdentifier, - const css::uno::Sequence< css::beans::Property >& PropertySet ) - throw( css::uno::RuntimeException, std::exception ); + const css::uno::Sequence< css::beans::Property >& PropertySet ); css::uno::Sequence< css::uno::Any > SAL_CALL setPropertyValues( diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx index daa4e7415918..72c67f1557c7 100644 --- a/ucb/source/ucp/file/filcmd.cxx +++ b/ucb/source/ucp/file/filcmd.cxx @@ -59,7 +59,6 @@ XCommandInfo_impl::release() uno::Any SAL_CALL XCommandInfo_impl::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, (static_cast< XCommandInfo* >(this)) ); @@ -69,7 +68,6 @@ XCommandInfo_impl::queryInterface( const uno::Type& rType ) uno::Sequence< CommandInfo > SAL_CALL XCommandInfo_impl::getCommands() - throw( uno::RuntimeException, std::exception ) { return m_pMyShell->m_sCommandInfo; } @@ -78,8 +76,6 @@ XCommandInfo_impl::getCommands() CommandInfo SAL_CALL XCommandInfo_impl::getCommandInfoByName( const OUString& aName ) - throw( UnsupportedCommandException, - uno::RuntimeException, std::exception) { for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); i++ ) if( m_pMyShell->m_sCommandInfo[i].Name == aName ) @@ -92,8 +88,6 @@ XCommandInfo_impl::getCommandInfoByName( CommandInfo SAL_CALL XCommandInfo_impl::getCommandInfoByHandle( sal_Int32 Handle ) - throw( UnsupportedCommandException, - uno::RuntimeException, std::exception ) { for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); ++i ) if( m_pMyShell->m_sCommandInfo[i].Handle == Handle ) @@ -106,7 +100,6 @@ XCommandInfo_impl::getCommandInfoByHandle( sal_Bool SAL_CALL XCommandInfo_impl::hasCommandByName( const OUString& aName ) - throw( uno::RuntimeException, std::exception ) { for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); ++i ) if( m_pMyShell->m_sCommandInfo[i].Name == aName ) @@ -119,7 +112,6 @@ XCommandInfo_impl::hasCommandByName( sal_Bool SAL_CALL XCommandInfo_impl::hasCommandByHandle( sal_Int32 Handle ) - throw( uno::RuntimeException, std::exception ) { for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); ++i ) if( m_pMyShell->m_sCommandInfo[i].Handle == Handle ) diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx index c9b686c49408..a42bc2422730 100644 --- a/ucb/source/ucp/file/filcmd.hxx +++ b/ucb/source/ucp/file/filcmd.hxx @@ -45,8 +45,7 @@ namespace fileaccess { // XInterface virtual css::uno::Any SAL_CALL - queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception) override; + queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() @@ -59,26 +58,19 @@ namespace fileaccess { // XCommandInfo virtual css::uno::Sequence< css::ucb::CommandInfo > SAL_CALL - getCommands() - throw( css::uno::RuntimeException, std::exception) override; + getCommands() override; virtual css::ucb::CommandInfo SAL_CALL - getCommandInfoByName( const OUString& Name ) - throw( css::ucb::UnsupportedCommandException, - css::uno::RuntimeException, std::exception) override; + getCommandInfoByName( const OUString& Name ) override; virtual css::ucb::CommandInfo SAL_CALL - getCommandInfoByHandle( sal_Int32 Handle ) - throw( css::ucb::UnsupportedCommandException, - css::uno::RuntimeException, std::exception ) override; + getCommandInfoByHandle( sal_Int32 Handle ) override; virtual sal_Bool SAL_CALL - hasCommandByName( const OUString& Name ) - throw( css::uno::RuntimeException, std::exception ) override; + hasCommandByName( const OUString& Name ) override; virtual sal_Bool SAL_CALL - hasCommandByHandle( sal_Int32 Handle ) - throw( css::uno::RuntimeException, std::exception ) override; + hasCommandByHandle( sal_Int32 Handle ) override; private: diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx index 5ef3565c8988..220d19fbd1f2 100644 --- a/ucb/source/ucp/file/filid.cxx +++ b/ucb/source/ucp/file/filid.cxx @@ -68,7 +68,6 @@ FileContentIdentifier::release() uno::Any SAL_CALL FileContentIdentifier::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -79,7 +78,6 @@ FileContentIdentifier::queryInterface( const uno::Type& rType ) uno::Sequence< sal_Int8 > SAL_CALL FileContentIdentifier::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -87,7 +85,6 @@ FileContentIdentifier::getImplementationId() uno::Sequence< uno::Type > SAL_CALL FileContentIdentifier::getTypes() - throw( uno::RuntimeException, std::exception ) { static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) { @@ -107,7 +104,6 @@ FileContentIdentifier::getTypes() OUString SAL_CALL FileContentIdentifier::getContentIdentifier() - throw( uno::RuntimeException, std::exception ) { return m_aContentId; } @@ -115,7 +111,6 @@ FileContentIdentifier::getContentIdentifier() OUString SAL_CALL FileContentIdentifier::getContentProviderScheme() - throw( uno::RuntimeException, std::exception ) { return m_aProviderScheme; } diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx index be04b008670c..428d4b4d91cc 100644 --- a/ucb/source/ucp/file/filid.hxx +++ b/ucb/source/ucp/file/filid.hxx @@ -43,8 +43,7 @@ namespace fileaccess { // XInterface virtual css::uno::Any SAL_CALL - queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() @@ -56,21 +55,17 @@ namespace fileaccess { // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + getTypes() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationId() override; // XContentIdentifier virtual OUString SAL_CALL - getContentIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + getContentIdentifier() override; virtual OUString SAL_CALL - getContentProviderScheme() - throw( css::uno::RuntimeException, std::exception ) override; + getContentProviderScheme() override; private: OUString m_aContentId; // The URL string diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 9b6d560e8c01..afbc02c950eb 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -83,7 +83,6 @@ XTYPEPROVIDER_IMPL_3( XInputStream_impl, uno::Any SAL_CALL XInputStream_impl::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception) { uno::Any aRet = cppu::queryInterface( rType, (static_cast< io::XInputStream* >(this)), @@ -113,10 +112,6 @@ sal_Int32 SAL_CALL XInputStream_impl::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception) { if( ! m_nIsOpen ) throw io::IOException( THROW_WHERE ); @@ -141,10 +136,6 @@ sal_Int32 SAL_CALL XInputStream_impl::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception) { return readBytes( aData,nMaxBytesToRead ); } @@ -152,10 +143,6 @@ XInputStream_impl::readSomeBytes( void SAL_CALL XInputStream_impl::skipBytes( sal_Int32 nBytesToSkip ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception) { m_aFile.setPos( osl_Pos_Current, sal_uInt64( nBytesToSkip ) ); } @@ -163,9 +150,6 @@ XInputStream_impl::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL XInputStream_impl::available() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception) { return 0; } @@ -173,9 +157,6 @@ XInputStream_impl::available() void SAL_CALL XInputStream_impl::closeInput() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { if( m_nIsOpen ) { @@ -189,9 +170,6 @@ XInputStream_impl::closeInput() void SAL_CALL XInputStream_impl::seek( sal_Int64 location ) - throw( lang::IllegalArgumentException, - io::IOException, - uno::RuntimeException, std::exception ) { if( location < 0 ) throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 0 ); @@ -202,8 +180,6 @@ XInputStream_impl::seek( sal_Int64 location ) sal_Int64 SAL_CALL XInputStream_impl::getPosition() - throw( io::IOException, - uno::RuntimeException, std::exception ) { sal_uInt64 uPos; if( osl::FileBase::E_None != m_aFile.getPos( uPos ) ) @@ -213,8 +189,6 @@ XInputStream_impl::getPosition() sal_Int64 SAL_CALL XInputStream_impl::getLength() - throw( io::IOException, - uno::RuntimeException, std::exception ) { sal_uInt64 uEndPos; if ( m_aFile.getSize(uEndPos) != osl::FileBase::E_None ) diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx index 8dc6c28db4e6..4e2c622e82b9 100644 --- a/ucb/source/ucp/file/filinpstr.hxx +++ b/ucb/source/ucp/file/filinpstr.hxx @@ -56,14 +56,11 @@ namespace fileaccess { // 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; virtual css::uno::Any SAL_CALL - queryInterface( const css::uno::Type& rType ) - throw( css::uno::RuntimeException, std::exception) override; + queryInterface( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire() @@ -76,55 +73,30 @@ namespace fileaccess { 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; 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/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx index 549f008daaa0..93c526f3571d 100644 --- a/ucb/source/ucp/file/filinsreq.hxx +++ b/ucb/source/ucp/file/filinsreq.hxx @@ -45,14 +45,12 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< { } - virtual void SAL_CALL select() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL select() override { m_bSelected = true; } - void SAL_CALL setName(const OUString& Name) - throw(css::uno::RuntimeException, std::exception) override + void SAL_CALL setName(const OUString& Name) override { m_aNewName = Name; } @@ -84,8 +82,7 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< { } - virtual void SAL_CALL select() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL select() override { m_bSelected = true; } diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx index be7fbecfeb64..179eb487098a 100644 --- a/ucb/source/ucp/file/filprp.cxx +++ b/ucb/source/ucp/file/filprp.cxx @@ -76,8 +76,6 @@ XPropertySetInfo_impl::~XPropertySetInfo_impl() beans::Property SAL_CALL XPropertySetInfo_impl::getPropertyByName( const OUString& aName ) - throw( beans::UnknownPropertyException, - RuntimeException, std::exception) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) if( m_seq[i].Name == aName ) return m_seq[i]; @@ -88,7 +86,6 @@ XPropertySetInfo_impl::getPropertyByName( const OUString& aName ) Sequence< beans::Property > SAL_CALL XPropertySetInfo_impl::getProperties() - throw( RuntimeException, std::exception ) { return m_seq; } @@ -96,7 +93,6 @@ XPropertySetInfo_impl::getProperties() sal_Bool SAL_CALL XPropertySetInfo_impl::hasPropertyByName( const OUString& aName ) - throw( RuntimeException, std::exception ) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) if( m_seq[i].Name == aName ) return true; diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx index 0a9208d4ab3a..1be9af995c7d 100644 --- a/ucb/source/ucp/file/filprp.hxx +++ b/ucb/source/ucp/file/filprp.hxx @@ -38,17 +38,13 @@ class XPropertySetInfo_impl : public cppu::WeakImplHelper< virtual ~XPropertySetInfo_impl() override; virtual css::uno::Sequence< css::beans::Property > SAL_CALL - getProperties() - throw( css::uno::RuntimeException, std::exception ) override; + getProperties() override; virtual css::beans::Property SAL_CALL - getPropertyByName( const OUString& aName ) - throw( css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + getPropertyByName( const OUString& aName ) override; virtual sal_Bool SAL_CALL - hasPropertyByName( const OUString& Name ) - throw( css::uno::RuntimeException, std::exception ) override; + hasPropertyByName( const OUString& Name ) override; private: TaskManager* m_pMyShell; diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx index e79555f1043c..47fa98e8f278 100644 --- a/ucb/source/ucp/file/filrow.cxx +++ b/ucb/source/ucp/file/filrow.cxx @@ -90,8 +90,6 @@ XRow_impl::~XRow_impl() sal_Bool SAL_CALL XRow_impl::wasNull() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { return m_nWasNull; } @@ -100,8 +98,6 @@ XRow_impl::wasNull() OUString SAL_CALL XRow_impl::getString( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -114,8 +110,6 @@ XRow_impl::getString( sal_Bool SAL_CALL XRow_impl::getBoolean( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -129,8 +123,6 @@ XRow_impl::getBoolean( sal_Int8 SAL_CALL XRow_impl::getByte( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -143,8 +135,6 @@ XRow_impl::getByte( sal_Int16 SAL_CALL XRow_impl::getShort( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -158,8 +148,6 @@ XRow_impl::getShort( sal_Int32 SAL_CALL XRow_impl::getInt( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -172,8 +160,6 @@ XRow_impl::getInt( sal_Int64 SAL_CALL XRow_impl::getLong( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -186,8 +172,6 @@ XRow_impl::getLong( float SAL_CALL XRow_impl::getFloat( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -200,8 +184,6 @@ XRow_impl::getFloat( double SAL_CALL XRow_impl::getDouble( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -214,8 +196,6 @@ XRow_impl::getDouble( uno::Sequence< sal_Int8 > SAL_CALL XRow_impl::getBytes( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -228,8 +208,6 @@ XRow_impl::getBytes( util::Date SAL_CALL XRow_impl::getDate( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -242,8 +220,6 @@ XRow_impl::getDate( util::Time SAL_CALL XRow_impl::getTime( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -256,8 +232,6 @@ XRow_impl::getTime( util::DateTime SAL_CALL XRow_impl::getTimestamp( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -271,8 +245,6 @@ XRow_impl::getTimestamp( uno::Reference< io::XInputStream > SAL_CALL XRow_impl::getBinaryStream( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -286,8 +258,6 @@ XRow_impl::getBinaryStream( uno::Reference< io::XInputStream > SAL_CALL XRow_impl::getCharacterStream( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -302,8 +272,6 @@ uno::Any SAL_CALL XRow_impl::getObject( sal_Int32 columnIndex, const uno::Reference< container::XNameAccess >& ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -316,8 +284,6 @@ XRow_impl::getObject( uno::Reference< sdbc::XRef > SAL_CALL XRow_impl::getRef( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -333,8 +299,6 @@ XRow_impl::getRef( uno::Reference< sdbc::XBlob > SAL_CALL XRow_impl::getBlob( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -350,8 +314,6 @@ XRow_impl::getBlob( uno::Reference< sdbc::XClob > SAL_CALL XRow_impl::getClob( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -368,8 +330,6 @@ XRow_impl::getClob( uno::Reference< sdbc::XArray > SAL_CALL XRow_impl::getArray( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx index 866627509d4b..589a5ad49f45 100644 --- a/ucb/source/ucp/file/filrow.hxx +++ b/ucb/source/ucp/file/filrow.hxx @@ -36,108 +36,67 @@ namespace fileaccess { virtual ~XRow_impl() override; virtual sal_Bool SAL_CALL - wasNull() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + wasNull() override; virtual OUString SAL_CALL - getString( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getString( sal_Int32 columnIndex ) override; virtual sal_Bool SAL_CALL - getBoolean( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getBoolean( sal_Int32 columnIndex ) override; virtual sal_Int8 SAL_CALL - getByte( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getByte( sal_Int32 columnIndex ) override; virtual sal_Int16 SAL_CALL - getShort( sal_Int32 columnIndex ) - throw( - css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getShort( sal_Int32 columnIndex ) override; virtual sal_Int32 SAL_CALL - getInt( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getInt( sal_Int32 columnIndex ) override; virtual sal_Int64 SAL_CALL - getLong( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getLong( sal_Int32 columnIndex ) override; virtual float SAL_CALL - getFloat( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getFloat( sal_Int32 columnIndex ) override; virtual double SAL_CALL getDouble( - sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 columnIndex ) override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getBytes( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getBytes( sal_Int32 columnIndex ) override; virtual css::util::Date SAL_CALL - getDate( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getDate( sal_Int32 columnIndex ) override; virtual css::util::Time SAL_CALL - getTime( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getTime( sal_Int32 columnIndex ) override; virtual css::util::DateTime SAL_CALL - getTimestamp( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getTimestamp( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getBinaryStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getBinaryStream( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getCharacterStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getCharacterStream( sal_Int32 columnIndex ) override; virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL - getRef( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getRef( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL - getBlob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getBlob( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL - getClob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getClob( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL - getArray( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getArray( sal_Int32 columnIndex ) override; private: osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index f677e8588b78..6d9f19b35f60 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -92,7 +92,6 @@ XResultSet_impl::~XResultSet_impl() void SAL_CALL XResultSet_impl::disposing( const lang::EventObject& ) - throw( uno::RuntimeException, std::exception ) { // To do, but what } @@ -101,7 +100,6 @@ XResultSet_impl::disposing( const lang::EventObject& ) void SAL_CALL XResultSet_impl::addEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -116,7 +114,6 @@ XResultSet_impl::addEventListener( void SAL_CALL XResultSet_impl::removeEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -127,7 +124,6 @@ XResultSet_impl::removeEventListener( void SAL_CALL XResultSet_impl::dispose() - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -205,9 +201,6 @@ void XResultSet_impl::isFinalChanged() bool SAL_CALL XResultSet_impl::OneMore() - throw( sdbc::SQLException, - uno::RuntimeException, - std::exception ) { if( ! m_nIsOpen ) return false; @@ -283,8 +276,6 @@ XResultSet_impl::OneMore() sal_Bool SAL_CALL XResultSet_impl::next() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { bool test; if( ++m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) test = true; @@ -296,8 +287,6 @@ XResultSet_impl::next() sal_Bool SAL_CALL XResultSet_impl::isBeforeFirst() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return m_nRow == -1; } @@ -305,8 +294,6 @@ XResultSet_impl::isBeforeFirst() sal_Bool SAL_CALL XResultSet_impl::isAfterLast() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()); // Cannot happen, if m_aFolder.isOpen() } @@ -314,8 +301,6 @@ XResultSet_impl::isAfterLast() sal_Bool SAL_CALL XResultSet_impl::isFirst() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return m_nRow == 0; } @@ -323,8 +308,6 @@ XResultSet_impl::isFirst() sal_Bool SAL_CALL XResultSet_impl::isLast() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( m_nRow == sal::static_int_cast<sal_Int32>(m_aItems.size()) - 1 ) return ! OneMore(); @@ -335,8 +318,6 @@ XResultSet_impl::isLast() void SAL_CALL XResultSet_impl::beforeFirst() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { m_nRow = -1; } @@ -344,8 +325,6 @@ XResultSet_impl::beforeFirst() void SAL_CALL XResultSet_impl::afterLast() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { m_nRow = sal::static_int_cast<sal_Int32>(m_aItems.size()); while( OneMore() ) @@ -355,8 +334,6 @@ XResultSet_impl::afterLast() sal_Bool SAL_CALL XResultSet_impl::first() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { m_nRow = -1; return next(); @@ -365,8 +342,6 @@ XResultSet_impl::first() sal_Bool SAL_CALL XResultSet_impl::last() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { m_nRow = sal::static_int_cast<sal_Int32>(m_aItems.size()) - 1; while( OneMore() ) @@ -377,8 +352,6 @@ XResultSet_impl::last() sal_Int32 SAL_CALL XResultSet_impl::getRow() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { // Test, whether behind last row if( -1 == m_nRow || m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()) ) @@ -389,7 +362,6 @@ XResultSet_impl::getRow() sal_Bool SAL_CALL XResultSet_impl::absolute( sal_Int32 row ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception) { if( row >= 0 ) { @@ -412,8 +384,6 @@ sal_Bool SAL_CALL XResultSet_impl::absolute( sal_Int32 row ) sal_Bool SAL_CALL XResultSet_impl::relative( sal_Int32 row ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( isAfterLast() || isBeforeFirst() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -428,8 +398,6 @@ XResultSet_impl::relative( sal_Int32 row ) sal_Bool SAL_CALL XResultSet_impl::previous() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( m_nRow > sal::static_int_cast<sal_Int32>(m_aItems.size()) ) m_nRow = sal::static_int_cast<sal_Int32>(m_aItems.size()); // Correct Handling of afterLast @@ -441,8 +409,6 @@ XResultSet_impl::previous() void SAL_CALL XResultSet_impl::refreshRow() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { // get the row from the filesystem return; @@ -451,24 +417,18 @@ XResultSet_impl::refreshRow() sal_Bool SAL_CALL XResultSet_impl::rowUpdated() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return false; } sal_Bool SAL_CALL XResultSet_impl::rowInserted() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return false; } sal_Bool SAL_CALL XResultSet_impl::rowDeleted() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return false; } @@ -476,8 +436,6 @@ XResultSet_impl::rowDeleted() uno::Reference< uno::XInterface > SAL_CALL XResultSet_impl::getStatement() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return uno::Reference< uno::XInterface >(); } @@ -487,8 +445,6 @@ XResultSet_impl::getStatement() void SAL_CALL XResultSet_impl::close() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( m_nIsOpen ) { @@ -502,7 +458,6 @@ XResultSet_impl::close() OUString SAL_CALL XResultSet_impl::queryContentIdentifierString() - throw( uno::RuntimeException, std::exception ) { uno::Reference< ucb::XContentIdentifier > xContentId = queryContentIdentifier(); @@ -516,7 +471,6 @@ XResultSet_impl::queryContentIdentifierString() uno::Reference< ucb::XContentIdentifier > SAL_CALL XResultSet_impl::queryContentIdentifier() - throw( uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) { @@ -532,7 +486,6 @@ XResultSet_impl::queryContentIdentifier() uno::Reference< ucb::XContent > SAL_CALL XResultSet_impl::queryContent() - throw( uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_pMyShell->m_pProvider->queryContent( queryContentIdentifier() ); @@ -547,8 +500,6 @@ XResultSet_impl::queryContent() // virtual uno::Reference< sdbc::XResultSet > SAL_CALL XResultSet_impl::getStaticResultSet() - throw( ucb::ListenerAlreadySetException, - uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -563,8 +514,6 @@ XResultSet_impl::getStaticResultSet() void SAL_CALL XResultSet_impl::setListener( const uno::Reference< ucb::XDynamicResultSetListener >& Listener ) - throw( ucb::ListenerAlreadySetException, - uno::RuntimeException, std::exception ) { osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -603,10 +552,6 @@ XResultSet_impl::setListener( void SAL_CALL XResultSet_impl::connectToCache( const uno::Reference< ucb::XDynamicResultSet > & xCache ) - throw( ucb::ListenerAlreadySetException, - ucb::AlreadyInitializedException, - ucb::ServiceNotFoundException, - uno::RuntimeException, std::exception ) { if( m_xListener.is() ) throw ucb::ListenerAlreadySetException( THROW_WHERE ); @@ -640,7 +585,6 @@ XResultSet_impl::connectToCache( // virtual sal_Int16 SAL_CALL XResultSet_impl::getCapabilities() - throw( uno::RuntimeException, std::exception ) { // Never set ucb::ContentResultSetCapability::SORTED // - Underlying content cannot provide sorted data... @@ -650,8 +594,6 @@ XResultSet_impl::getCapabilities() // XResultSetMetaDataSupplier uno::Reference< sdbc::XResultSetMetaData > SAL_CALL XResultSet_impl::getMetaData() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { for ( sal_Int32 n = 0; n < m_sProperty.getLength(); ++n ) { @@ -682,7 +624,6 @@ XResultSet_impl::getMetaData() // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL XResultSet_impl::getPropertySetInfo() - throw( uno::RuntimeException, std::exception) { uno::Sequence< beans::Property > seq(2); @@ -704,11 +645,6 @@ XResultSet_impl::getPropertySetInfo() void SAL_CALL XResultSet_impl::setPropertyValue( const OUString& aPropertyName, const uno::Any& ) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" || aPropertyName == "RowCount" ) @@ -719,9 +655,6 @@ void SAL_CALL XResultSet_impl::setPropertyValue( uno::Any SAL_CALL XResultSet_impl::getPropertyValue( const OUString& PropertyName ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if( PropertyName == "IsRowCountFinal" ) { @@ -740,9 +673,6 @@ uno::Any SAL_CALL XResultSet_impl::getPropertyValue( void SAL_CALL XResultSet_impl::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" ) { @@ -769,9 +699,6 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener( void SAL_CALL XResultSet_impl::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" && m_pIsFinalListeners ) @@ -793,9 +720,6 @@ void SAL_CALL XResultSet_impl::removePropertyChangeListener( void SAL_CALL XResultSet_impl::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { } @@ -803,9 +727,6 @@ void SAL_CALL XResultSet_impl::addVetoableChangeListener( void SAL_CALL XResultSet_impl::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { } diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index e4dea03b1313..3c2769ac2ecb 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -91,29 +91,23 @@ class XResultSet_impl : public Notifier, // XEventListener virtual void SAL_CALL - disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException, std::exception ) override; + disposing( const css::lang::EventObject& Source ) override; // XComponent virtual void SAL_CALL - dispose() - throw( css::uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL addEventListener( - const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw( css::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XRow virtual sal_Bool SAL_CALL - wasNull() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + wasNull() override { if( 0<= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) m_nWasNull = m_aItems[m_nRow]->wasNull(); @@ -123,9 +117,7 @@ class XResultSet_impl : public Notifier, } virtual OUString SAL_CALL - getString( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getString( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getString( columnIndex ); @@ -134,9 +126,7 @@ class XResultSet_impl : public Notifier, } virtual sal_Bool SAL_CALL - getBoolean( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getBoolean( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBoolean( columnIndex ); @@ -145,9 +135,7 @@ class XResultSet_impl : public Notifier, } virtual sal_Int8 SAL_CALL - getByte( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getByte( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getByte( columnIndex ); @@ -156,10 +144,7 @@ class XResultSet_impl : public Notifier, } virtual sal_Int16 SAL_CALL - getShort( sal_Int32 columnIndex ) - throw( - css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getShort( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getShort( columnIndex ); @@ -168,9 +153,7 @@ class XResultSet_impl : public Notifier, } virtual sal_Int32 SAL_CALL - getInt( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + getInt( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getInt( columnIndex ); @@ -179,9 +162,7 @@ class XResultSet_impl : public Notifier, } virtual sal_Int64 SAL_CALL - getLong( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getLong( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getLong( columnIndex ); @@ -190,9 +171,7 @@ class XResultSet_impl : public Notifier, } virtual float SAL_CALL - getFloat( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + getFloat( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getFloat( columnIndex ); @@ -201,9 +180,7 @@ class XResultSet_impl : public Notifier, } virtual double SAL_CALL - getDouble( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + getDouble( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDouble( columnIndex ); @@ -212,9 +189,7 @@ class XResultSet_impl : public Notifier, } virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getBytes( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + getBytes( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBytes( columnIndex ); @@ -223,9 +198,7 @@ class XResultSet_impl : public Notifier, } virtual css::util::Date SAL_CALL - getDate( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getDate( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDate( columnIndex ); @@ -234,9 +207,7 @@ class XResultSet_impl : public Notifier, } virtual css::util::Time SAL_CALL - getTime( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getTime( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTime( columnIndex ); @@ -245,9 +216,7 @@ class XResultSet_impl : public Notifier, } virtual css::util::DateTime SAL_CALL - getTimestamp( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getTimestamp( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTimestamp( columnIndex ); @@ -256,9 +225,7 @@ class XResultSet_impl : public Notifier, } virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getBinaryStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getBinaryStream( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBinaryStream( columnIndex ); @@ -267,9 +234,7 @@ class XResultSet_impl : public Notifier, } virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getCharacterStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getCharacterStream( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getCharacterStream( columnIndex ); @@ -279,9 +244,7 @@ class XResultSet_impl : public Notifier, virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getObject( columnIndex,typeMap ); @@ -290,9 +253,7 @@ class XResultSet_impl : public Notifier, } virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL - getRef( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getRef( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getRef( columnIndex ); @@ -301,9 +262,7 @@ class XResultSet_impl : public Notifier, } virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL - getBlob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getBlob( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBlob( columnIndex ); @@ -312,9 +271,7 @@ class XResultSet_impl : public Notifier, } virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL - getClob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getClob( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getClob( columnIndex ); @@ -323,9 +280,7 @@ class XResultSet_impl : public Notifier, } virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL - getArray( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getArray( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getArray( columnIndex ); @@ -337,202 +292,129 @@ class XResultSet_impl : public Notifier, // XResultSet virtual sal_Bool SAL_CALL - next() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + next() override; virtual sal_Bool SAL_CALL - isBeforeFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + isBeforeFirst() override; virtual sal_Bool SAL_CALL - isAfterLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + isAfterLast() override; virtual sal_Bool SAL_CALL - isFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + isFirst() override; virtual sal_Bool SAL_CALL - isLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + isLast() override; virtual void SAL_CALL - beforeFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + beforeFirst() override; virtual void SAL_CALL - afterLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + afterLast() override; virtual sal_Bool SAL_CALL - first() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + first() override; virtual sal_Bool SAL_CALL - last() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + last() override; virtual sal_Int32 SAL_CALL - getRow() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getRow() override; virtual sal_Bool SAL_CALL - absolute( sal_Int32 row ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + absolute( sal_Int32 row ) override; virtual sal_Bool SAL_CALL - relative( sal_Int32 rows ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + relative( sal_Int32 rows ) override; virtual sal_Bool SAL_CALL - previous() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + previous() override; virtual void SAL_CALL - refreshRow() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + refreshRow() override; virtual sal_Bool SAL_CALL - rowUpdated() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + rowUpdated() override; virtual sal_Bool SAL_CALL - rowInserted() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + rowInserted() override; virtual sal_Bool SAL_CALL - rowDeleted() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + rowDeleted() override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - getStatement() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getStatement() override; // XDynamicResultSet virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL - getStaticResultSet() - throw( css::ucb::ListenerAlreadySetException, - css::uno::RuntimeException, std::exception ) override; + getStaticResultSet() override; virtual void SAL_CALL setListener( const css::uno::Reference< - css::ucb::XDynamicResultSetListener >& Listener ) - throw( css::ucb::ListenerAlreadySetException, - css::uno::RuntimeException, std::exception ) override; + css::ucb::XDynamicResultSetListener >& Listener ) override; virtual void SAL_CALL - connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) - throw( css::ucb::ListenerAlreadySetException, - css::ucb::AlreadyInitializedException, - css::ucb::ServiceNotFoundException, - css::uno::RuntimeException, std::exception ) override; + connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) override; virtual sal_Int16 SAL_CALL - getCapabilities() - throw( css::uno::RuntimeException, std::exception ) override; + getCapabilities() override; // XCloseable virtual void SAL_CALL - close() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + close() override; // XContentAccess virtual OUString SAL_CALL - queryContentIdentifierString() - throw( css::uno::RuntimeException, std::exception ) override; + queryContentIdentifierString() override; virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL - queryContentIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + queryContentIdentifier() override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent() - throw( css::uno::RuntimeException, std::exception ) override; + queryContent() override; // XResultSetMetaDataSupplier virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL - getMetaData() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getMetaData() override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw( css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const css::uno::Any& aValue ) - throw( css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& aValue ) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& PropertyName ) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; private: @@ -571,10 +453,7 @@ class XResultSet_impl : public Notifier, // Methods /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - bool SAL_CALL OneMore() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, - std::exception ); + bool SAL_CALL OneMore(); void rowCountChanged(); void isFinalChanged(); diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 41891839f3d3..20e4952ab5f3 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -85,7 +85,6 @@ XStream_impl::~XStream_impl() uno::Reference< io::XInputStream > SAL_CALL XStream_impl::getInputStream( ) - throw( uno::RuntimeException, std::exception) { { osl::MutexGuard aGuard( m_aMutex ); @@ -97,7 +96,6 @@ XStream_impl::getInputStream( ) uno::Reference< io::XOutputStream > SAL_CALL XStream_impl::getOutputStream( ) - throw( uno::RuntimeException, std::exception ) { { osl::MutexGuard aGuard( m_aMutex ); @@ -108,7 +106,6 @@ XStream_impl::getOutputStream( ) void SAL_CALL XStream_impl::truncate() - throw( io::IOException, uno::RuntimeException, std::exception ) { if (osl::FileBase::E_None != m_aFile.setSize(0)) throw io::IOException( THROW_WHERE ); @@ -125,10 +122,6 @@ sal_Int32 SAL_CALL XStream_impl::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception) { if( ! m_nIsOpen ) throw io::IOException( THROW_WHERE ); @@ -159,10 +152,6 @@ sal_Int32 SAL_CALL XStream_impl::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception) { return readBytes( aData,nMaxBytesToRead ); } @@ -170,10 +159,6 @@ XStream_impl::readSomeBytes( void SAL_CALL XStream_impl::skipBytes( sal_Int32 nBytesToSkip ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { m_aFile.setPos( osl_Pos_Current, sal_uInt64( nBytesToSkip ) ); } @@ -181,9 +166,6 @@ XStream_impl::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL XStream_impl::available() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception) { return 0; } @@ -191,10 +173,6 @@ XStream_impl::available() void SAL_CALL XStream_impl::writeBytes( const uno::Sequence< sal_Int8 >& aData ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception) { sal_uInt32 length = aData.getLength(); if(length) @@ -210,9 +188,6 @@ XStream_impl::writeBytes( const uno::Sequence< sal_Int8 >& aData ) void SAL_CALL XStream_impl::closeStream() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException ) { if( m_nIsOpen ) { @@ -230,9 +205,6 @@ XStream_impl::closeStream() void SAL_CALL XStream_impl::closeInput() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); m_bInputStreamCalled = false; @@ -244,9 +216,6 @@ XStream_impl::closeInput() void SAL_CALL XStream_impl::closeOutput() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); m_bOutputStreamCalled = false; @@ -258,9 +227,6 @@ XStream_impl::closeOutput() void SAL_CALL XStream_impl::seek( sal_Int64 location ) - throw( lang::IllegalArgumentException, - io::IOException, - uno::RuntimeException, std::exception ) { if( location < 0 ) throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 0 ); @@ -271,8 +237,6 @@ XStream_impl::seek( sal_Int64 location ) sal_Int64 SAL_CALL XStream_impl::getPosition() - throw( io::IOException, - uno::RuntimeException, std::exception ) { sal_uInt64 uPos; if( osl::FileBase::E_None != m_aFile.getPos( uPos ) ) @@ -282,8 +246,6 @@ XStream_impl::getPosition() sal_Int64 SAL_CALL XStream_impl::getLength() - throw( io::IOException, - uno::RuntimeException, std::exception ) { sal_uInt64 uEndPos; if ( m_aFile.getSize(uEndPos) != osl::FileBase::E_None ) @@ -294,14 +256,9 @@ XStream_impl::getLength() void SAL_CALL XStream_impl::flush() - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) {} void XStream_impl::waitForCompletion() - throw (io::IOException, uno::RuntimeException, std::exception) { // At least on UNIX, to reliably learn about any errors encountered by // asynchronous NFS write operations, without closing the file directly diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index c4308afa3184..c65b7cda76cb 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -63,19 +63,15 @@ class XStream_impl : public cppu::WeakImplHelper< // XStream virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getInputStream() - throw( css::uno::RuntimeException, std::exception ) override; + getInputStream() override; virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL - getOutputStream() - throw( css::uno::RuntimeException, std::exception ) override; + getOutputStream() override; // XTruncate - virtual void SAL_CALL truncate() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL truncate() override; // XInputStream @@ -83,88 +79,49 @@ class XStream_impl : public cppu::WeakImplHelper< 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; 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; 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; sal_Int32 SAL_CALL - available() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + available() override; void SAL_CALL - closeInput() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + closeInput() override; // XSeekable 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; sal_Int64 SAL_CALL - getPosition() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + getPosition() override; sal_Int64 SAL_CALL - getLength() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + getLength() override; // XOutputStream 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; + writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override; void SAL_CALL - flush() - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + flush() override; void SAL_CALL - closeOutput() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + closeOutput() override; - virtual void SAL_CALL waitForCompletion() - throw ( - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL waitForCompletion() override; private: @@ -183,10 +140,7 @@ class XStream_impl : public cppu::WeakImplHelper< /// @throws css::io::IOException /// @throws css::uno::RuntimeException void SAL_CALL - closeStream() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException ); + closeStream(); }; diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index cc038ca61a0f..653289b13a5c 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -390,7 +390,6 @@ void SAL_CALL TaskManager::startTask( sal_Int32 CommandId, const uno::Reference< XCommandEnvironment >& xCommandEnv ) - throw( DuplicateCommandIdentifierException ) { osl::MutexGuard aGuard( m_aMutex ); TaskMap::iterator it = m_aTaskMap.find( CommandId ); @@ -571,9 +570,6 @@ TaskManager::associate( const OUString& aUnqPath, const OUString& PropertyName, const uno::Any& DefaultValue, const sal_Int16 Attributes ) - throw( beans::PropertyExistException, - beans::IllegalTypeException, - uno::RuntimeException ) { MyProperty newProperty( false, PropertyName, @@ -611,9 +607,6 @@ TaskManager::associate( const OUString& aUnqPath, void SAL_CALL TaskManager::deassociate( const OUString& aUnqPath, const OUString& PropertyName ) - throw( beans::UnknownPropertyException, - beans::NotRemoveableException, - uno::RuntimeException ) { MyProperty oldProperty( PropertyName ); diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index eb81fd594a35..e924f191dd16 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -254,8 +254,7 @@ namespace fileaccess /// @throws css::ucb::DuplicateCommandIdentifierException void SAL_CALL startTask( sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv ) - throw( css::ucb::DuplicateCommandIdentifierException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv ); sal_Int32 SAL_CALL getCommandId(); void SAL_CALL abort( sal_Int32 CommandId ); @@ -322,19 +321,13 @@ namespace fileaccess void SAL_CALL associate( const OUString& UnqPath, const OUString& PropertyName, const css::uno::Any& DefaultValue, - const sal_Int16 Attributes ) - throw( css::beans::PropertyExistException, - css::beans::IllegalTypeException, - css::uno::RuntimeException); + const sal_Int16 Attributes ); /// @throws css::beans::UnknownPropertyException /// @throws css::beans::NotRemoveableException /// @throws css::uno::RuntimeException void SAL_CALL deassociate( const OUString& UnqPath, - const OUString& PropertyName ) - throw( css::beans::UnknownPropertyException, - css::beans::NotRemoveableException, - css::uno::RuntimeException); + const OUString& PropertyName ); // Every method having a command id is not allowed to throw anything, diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 9659d5caaf59..5552d016a43b 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -105,7 +105,6 @@ void SAL_CALL FileProvider::init() void SAL_CALL FileProvider::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException, std::exception) { if( ! m_pMyShell ) { OUString config; @@ -121,20 +120,17 @@ FileProvider::initialize( // XServiceInfo methods. OUString SAL_CALL FileProvider::getImplementationName() - throw( RuntimeException, std::exception ) { return fileaccess::TaskManager::getImplementationName_static(); } sal_Bool SAL_CALL FileProvider::supportsService(const OUString& ServiceName ) - throw( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL FileProvider::getSupportedServiceNames() - throw( RuntimeException, std::exception ) { return fileaccess::TaskManager::getSupportedServiceNames_static(); } @@ -165,8 +161,6 @@ FileProvider::CreateInstance( Reference< XContent > SAL_CALL FileProvider::queryContent( const Reference< XContentIdentifier >& xIdentifier ) - throw( IllegalIdentifierException, - RuntimeException, std::exception) { init(); OUString aUnc; @@ -184,7 +178,6 @@ sal_Int32 SAL_CALL FileProvider::compareContentIds( const Reference< XContentIdentifier >& Id1, const Reference< XContentIdentifier >& Id2 ) - throw( RuntimeException, std::exception ) { init(); OUString aUrl1 = Id1->getContentIdentifier(); @@ -241,7 +234,6 @@ FileProvider::compareContentIds( Reference< XContentIdentifier > SAL_CALL FileProvider::createContentIdentifier( const OUString& ContentId ) - throw( RuntimeException, std::exception ) { init(); FileContentIdentifier* p = new FileContentIdentifier( ContentId,false ); @@ -260,8 +252,7 @@ public: // XInterface virtual Any SAL_CALL - queryInterface( const Type& aType ) - throw( RuntimeException, std::exception) override; + queryInterface( const Type& aType ) override; virtual void SAL_CALL acquire() @@ -273,17 +264,13 @@ public: virtual Sequence< Property > SAL_CALL - getProperties() - throw( RuntimeException, std::exception ) override; + getProperties() override; virtual Property SAL_CALL - getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, - RuntimeException, std::exception) override; + getPropertyByName( const OUString& aName ) override; virtual sal_Bool SAL_CALL - hasPropertyByName( const OUString& Name ) - throw( RuntimeException, std::exception ) override; + hasPropertyByName( const OUString& Name ) override; private: @@ -328,7 +315,6 @@ XPropertySetInfoImpl2::release() Any SAL_CALL XPropertySetInfoImpl2::queryInterface( const Type& rType ) - throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, (static_cast< XPropertySetInfo* >(this)) ); @@ -338,8 +324,6 @@ XPropertySetInfoImpl2::queryInterface( const Type& rType ) Property SAL_CALL XPropertySetInfoImpl2::getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, - RuntimeException, std::exception) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) if( m_seq[i].Name == aName ) @@ -351,7 +335,6 @@ XPropertySetInfoImpl2::getPropertyByName( const OUString& aName ) Sequence< Property > SAL_CALL XPropertySetInfoImpl2::getProperties() - throw( RuntimeException, std::exception ) { return m_seq; } @@ -360,7 +343,6 @@ XPropertySetInfoImpl2::getProperties() sal_Bool SAL_CALL XPropertySetInfoImpl2::hasPropertyByName( const OUString& aName ) - throw( RuntimeException, std::exception ) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) if( m_seq[i].Name == aName ) @@ -401,7 +383,6 @@ void SAL_CALL FileProvider::initProperties() Reference< XPropertySetInfo > SAL_CALL FileProvider::getPropertySetInfo( ) - throw( RuntimeException, std::exception ) { initProperties(); return m_xPropertySetInfo; @@ -411,11 +392,6 @@ FileProvider::getPropertySetInfo( ) void SAL_CALL FileProvider::setPropertyValue( const OUString& aPropertyName, const Any& ) - throw( UnknownPropertyException, - PropertyVetoException, - IllegalArgumentException, - WrappedTargetException, - RuntimeException, std::exception ) { if( aPropertyName == "FileSystemNotation" || aPropertyName == "HomeDirectory" || @@ -429,9 +405,6 @@ FileProvider::setPropertyValue( const OUString& aPropertyName, Any SAL_CALL FileProvider::getPropertyValue( const OUString& aPropertyName ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { initProperties(); if( aPropertyName == "FileSystemNotation" ) @@ -455,9 +428,6 @@ void SAL_CALL FileProvider::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception) { return; } @@ -467,9 +437,6 @@ void SAL_CALL FileProvider::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { return; } @@ -478,9 +445,6 @@ void SAL_CALL FileProvider::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { return; } @@ -490,9 +454,6 @@ void SAL_CALL FileProvider::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception) { return; } @@ -502,7 +463,6 @@ FileProvider::removeVetoableChangeListener( sal_Int32 SAL_CALL FileProvider::getFileProviderLocality( const OUString& BaseURL ) - throw( RuntimeException, std::exception ) { // If the base URL is a 'file' URL, return 10 (very 'local'), otherwise // return -1 (missmatch). What is missing is a fast comparison to ASCII, @@ -518,7 +478,6 @@ FileProvider::getFileProviderLocality( const OUString& BaseURL ) OUString SAL_CALL FileProvider::getFileURLFromSystemPath( const OUString&, const OUString& SystemPath ) - throw( RuntimeException, std::exception ) { OUString aNormalizedPath; if ( osl::FileBase::getFileURLFromSystemPath( SystemPath,aNormalizedPath ) != osl::FileBase::E_None ) @@ -528,7 +487,6 @@ OUString SAL_CALL FileProvider::getFileURLFromSystemPath( const OUString&, } OUString SAL_CALL FileProvider::getSystemPathFromFileURL( const OUString& URL ) - throw( RuntimeException, std::exception ) { OUString aSystemPath; if (osl::FileBase::getSystemPathFromFileURL( URL,aSystemPath ) != osl::FileBase::E_None ) diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index 28c8238ea329..78e44db96323 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -64,16 +64,13 @@ namespace fileaccess { // XServiceInfo virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL @@ -87,99 +84,70 @@ namespace fileaccess { // XInitialization virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; // 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; + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; // XContentIdentifierFactory virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL createContentIdentifier( - const OUString& ContentId ) - throw( css::uno::RuntimeException, std::exception ) override; + const OUString& ContentId ) override; virtual sal_Int32 SAL_CALL compareContentIds( const css::uno::Reference< css::ucb::XContentIdentifier >& Id1, - const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) override; // XProperySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo( ) - throw( css::uno::RuntimeException, std::exception ) override; + getPropertySetInfo( ) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const css::uno::Any& aValue ) - throw( css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Any& aValue ) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& PropertyName ) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XFileIdentifierConverter virtual sal_Int32 SAL_CALL - getFileProviderLocality( const OUString& BaseURL ) - throw( css::uno::RuntimeException, std::exception ) override; + getFileProviderLocality( const OUString& BaseURL ) override; virtual OUString SAL_CALL getFileURLFromSystemPath( const OUString& BaseURL, - const OUString& SystemPath ) - throw( css::uno::RuntimeException, std::exception ) override; + const OUString& SystemPath ) override; - virtual OUString SAL_CALL getSystemPathFromFileURL( const OUString& URL ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getSystemPathFromFileURL( const OUString& URL ) override; private: |