diff options
Diffstat (limited to 'ucbhelper')
19 files changed, 21 insertions, 353 deletions
diff --git a/ucbhelper/source/client/activedatasink.cxx b/ucbhelper/source/client/activedatasink.cxx index 604801f4983a..b232cca7cfb0 100644 --- a/ucbhelper/source/client/activedatasink.cxx +++ b/ucbhelper/source/client/activedatasink.cxx @@ -34,7 +34,6 @@ namespace ucbhelper // virtual void SAL_CALL ActiveDataSink::setInputStream( const uno::Reference< io::XInputStream >& aStream ) - throw( uno::RuntimeException, std::exception ) { m_xStream = aStream; } @@ -42,7 +41,6 @@ void SAL_CALL ActiveDataSink::setInputStream( const uno::Reference< io::XInputSt // virtual uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream() - throw( uno::RuntimeException, std::exception ) { return m_xStream; } diff --git a/ucbhelper/source/client/activedatastreamer.cxx b/ucbhelper/source/client/activedatastreamer.cxx index 0190b6d11ee4..bd98cf74e1b5 100644 --- a/ucbhelper/source/client/activedatastreamer.cxx +++ b/ucbhelper/source/client/activedatastreamer.cxx @@ -35,16 +35,12 @@ namespace ucbhelper // virtual void SAL_CALL ActiveDataStreamer::setStream( const uno::Reference< io::XStream >& xStream ) - throw( uno::RuntimeException, - std::exception ) { m_xStream = xStream; } // virtual uno::Reference< io::XStream > SAL_CALL ActiveDataStreamer::getStream() - throw( uno::RuntimeException, - std::exception ) { return m_xStream; } diff --git a/ucbhelper/source/client/commandenvironment.cxx b/ucbhelper/source/client/commandenvironment.cxx index 1210d301b1bb..7ee9cd2f85bd 100644 --- a/ucbhelper/source/client/commandenvironment.cxx +++ b/ucbhelper/source/client/commandenvironment.cxx @@ -69,14 +69,12 @@ CommandEnvironment::~CommandEnvironment() // virtual Reference< XInteractionHandler > SAL_CALL CommandEnvironment::getInteractionHandler() - throw ( RuntimeException, std::exception ) { return m_pImpl->m_xInteractionHandler; } // virtual Reference< XProgressHandler > SAL_CALL CommandEnvironment::getProgressHandler() - throw ( RuntimeException, std::exception ) { return m_pImpl->m_xProgressHandler; } diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 5f723e62cfb4..d1e7feb3b6dc 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -80,22 +80,16 @@ class EmptyInputStream : public ::cppu::WeakImplHelper< XInputStream > { public: virtual sal_Int32 SAL_CALL readBytes( - Sequence< sal_Int8 > & data, sal_Int32 nBytesToRead ) - throw (IOException, RuntimeException, std::exception) override; + Sequence< sal_Int8 > & data, sal_Int32 nBytesToRead ) override; virtual sal_Int32 SAL_CALL readSomeBytes( - Sequence< sal_Int8 > & data, sal_Int32 nMaxBytesToRead ) - throw (IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw (IOException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available() - throw (IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput() - throw (IOException, RuntimeException, std::exception) override; + Sequence< sal_Int8 > & data, sal_Int32 nMaxBytesToRead ) override; + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override; + virtual sal_Int32 SAL_CALL available() override; + virtual void SAL_CALL closeInput() override; }; sal_Int32 EmptyInputStream::readBytes( Sequence< sal_Int8 > & data, sal_Int32 ) - throw (IOException, RuntimeException, std::exception) { data.realloc( 0 ); return 0; @@ -103,25 +97,21 @@ sal_Int32 EmptyInputStream::readBytes( sal_Int32 EmptyInputStream::readSomeBytes( Sequence< sal_Int8 > & data, sal_Int32 ) - throw (IOException, RuntimeException, std::exception) { data.realloc( 0 ); return 0; } void EmptyInputStream::skipBytes( sal_Int32 ) - throw (IOException, RuntimeException, std::exception) { } sal_Int32 EmptyInputStream::available() - throw (IOException, RuntimeException, std::exception) { return 0; } void EmptyInputStream::closeInput() - throw (IOException, RuntimeException, std::exception) { } @@ -139,20 +129,17 @@ public: : m_rContent( rContent ) {} // 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; // XContentEventListener - virtual void SAL_CALL contentEvent( const ContentEvent& evt ) - throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL contentEvent( const ContentEvent& evt ) override; // XEventListener ( base of XContentEventListener ) - virtual void SAL_CALL disposing( const EventObject& Source ) - throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const EventObject& Source ) override; }; @@ -205,7 +192,6 @@ public: /// @throws RuntimeException static void ensureContentProviderForURL( const Reference< XUniversalContentBroker >& rBroker, const OUString & rURL ) - throw ( ContentCreationException, RuntimeException ) { Reference< XContentProvider > xProv = rBroker->queryContentProvider( rURL ); @@ -223,7 +209,6 @@ static void ensureContentProviderForURL( const Reference< XUniversalContentBroke static Reference< XContentIdentifier > getContentIdentifierThrow( const Reference< XUniversalContentBroker > & rBroker, const OUString & rURL) - throw (ContentCreationException, RuntimeException) { Reference< XContentIdentifier > xId = rBroker->createContentIdentifier( rURL ); @@ -245,7 +230,6 @@ static Reference< XContentIdentifier > getContentIdentifierThrow( static Reference< XContentIdentifier > getContentIdentifierNoThrow( const Reference< XUniversalContentBroker > & rBroker, const OUString & rURL) - throw (RuntimeException) { return rBroker->createContentIdentifier(rURL); } @@ -255,7 +239,6 @@ static Reference< XContentIdentifier > getContentIdentifierNoThrow( static Reference< XContent > getContentThrow( const Reference< XUniversalContentBroker > & rBroker, const Reference< XContentIdentifier > & xId) - throw ( ContentCreationException, RuntimeException ) { Reference< XContent > xContent; OUString msg; @@ -286,7 +269,6 @@ static Reference< XContent > getContentThrow( static Reference< XContent > getContentNoThrow( const Reference< XUniversalContentBroker > & rBroker, const Reference< XContentIdentifier > & xId) - throw ( RuntimeException ) { Reference< XContent > xContent; try @@ -314,7 +296,6 @@ Content::Content() Content::Content( const OUString& rURL, const Reference< XCommandEnvironment >& rEnv, const Reference< XComponentContext >& rCtx ) - throw ( ContentCreationException, RuntimeException ) { Reference< XUniversalContentBroker > pBroker( UniversalContentBroker::create( rCtx ) ); @@ -331,7 +312,6 @@ Content::Content( const OUString& rURL, Content::Content( const Reference< XContent >& rContent, const Reference< XCommandEnvironment >& rEnv, const Reference< XComponentContext >& rCtx ) - throw ( ContentCreationException, RuntimeException ) { m_xImpl = new Content_Impl( rCtx, rContent, rEnv ); } @@ -415,7 +395,6 @@ void Content::setCommandEnvironment( Reference< XCommandInfo > Content::getCommands() - throw( CommandAbortedException, RuntimeException, Exception ) { Command aCommand; aCommand.Name = "getCommandInfo"; @@ -431,7 +410,6 @@ Reference< XCommandInfo > Content::getCommands() Reference< XPropertySetInfo > Content::getProperties() - throw( CommandAbortedException, RuntimeException, Exception ) { Command aCommand; aCommand.Name = "getPropertySetInfo"; @@ -447,7 +425,6 @@ Reference< XPropertySetInfo > Content::getProperties() Any Content::getPropertyValue( const OUString& rPropertyName ) - throw( CommandAbortedException, RuntimeException, Exception ) { Sequence<OUString> aNames { rPropertyName }; @@ -458,7 +435,6 @@ Any Content::getPropertyValue( const OUString& rPropertyName ) Any Content::setPropertyValue( const OUString& rName, const Any& rValue ) - throw( CommandAbortedException, RuntimeException, Exception ) { Sequence<OUString> aNames { rName }; @@ -472,7 +448,6 @@ Any Content::setPropertyValue( const OUString& rName, Sequence< Any > Content::getPropertyValues( const Sequence< OUString >& rPropertyNames ) - throw( CommandAbortedException, RuntimeException, Exception ) { Reference< XRow > xRow = getPropertyValuesInterface( rPropertyNames ); @@ -493,7 +468,6 @@ Sequence< Any > Content::getPropertyValues( Reference< XRow > Content::getPropertyValuesInterface( const Sequence< OUString >& rPropertyNames ) - throw( CommandAbortedException, RuntimeException, Exception ) { sal_Int32 nCount = rPropertyNames.getLength(); Sequence< Property > aProps( nCount ); @@ -527,7 +501,6 @@ Reference< XRow > Content::getPropertyValuesInterface( Sequence< Any > Content::setPropertyValues( const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rValues ) - throw( CommandAbortedException, RuntimeException, Exception ) { if ( rPropertyNames.getLength() != rValues.getLength() ) { @@ -574,7 +547,6 @@ Sequence< Any > Content::setPropertyValues( Any Content::executeCommand( const OUString& rCommandName, const Any& rCommandArgument ) - throw( CommandAbortedException, RuntimeException, Exception ) { Command aCommand; aCommand.Name = rCommandName; @@ -587,7 +559,6 @@ Any Content::executeCommand( const OUString& rCommandName, Any Content::createCursorAny( const Sequence< OUString >& rPropertyNames, ResultSetInclude eMode ) - throw( CommandAbortedException, RuntimeException, Exception ) { sal_Int32 nCount = rPropertyNames.getLength(); Sequence< Property > aProps( nCount ); @@ -621,7 +592,6 @@ Any Content::createCursorAny( const Sequence< OUString >& rPropertyNames, Reference< XResultSet > Content::createCursor( const Sequence< OUString >& rPropertyNames, ResultSetInclude eMode ) - throw( CommandAbortedException, RuntimeException, Exception ) { Any aCursorAny = createCursorAny( rPropertyNames, eMode ); @@ -651,7 +621,6 @@ Reference< XResultSet > Content::createCursor( Reference< XDynamicResultSet > Content::createDynamicCursor( const Sequence< OUString >& rPropertyNames, ResultSetInclude eMode ) - throw( CommandAbortedException, RuntimeException, Exception ) { Reference< XDynamicResultSet > aResult; createCursorAny( rPropertyNames, eMode ) >>= aResult; @@ -667,7 +636,6 @@ Reference< XResultSet > Content::createSortedCursor( const Sequence< NumberedSortingInfo >& rSortInfo, const Reference< XAnyCompareFactory >& rAnyCompareFactory, ResultSetInclude eMode ) - throw( CommandAbortedException, RuntimeException, Exception ) { Reference< XResultSet > aResult; Reference< XDynamicResultSet > aDynSet; @@ -715,7 +683,6 @@ Reference< XResultSet > Content::createSortedCursor( Reference< XInputStream > Content::openStream() - throw( CommandAbortedException, RuntimeException, Exception ) { if ( !isDocument() ) return Reference< XInputStream >(); @@ -740,7 +707,6 @@ Reference< XInputStream > Content::openStream() Reference< XInputStream > Content::openStreamNoLock() - throw( CommandAbortedException, RuntimeException, Exception ) { if ( !isDocument() ) return Reference< XInputStream >(); @@ -765,7 +731,6 @@ Reference< XInputStream > Content::openStreamNoLock() Reference< XStream > Content::openWriteableStream() - throw( CommandAbortedException, RuntimeException, Exception ) { if ( !isDocument() ) return Reference< XStream >(); @@ -790,7 +755,6 @@ Reference< XStream > Content::openWriteableStream() Reference< XStream > Content::openWriteableStreamNoLock() - throw( CommandAbortedException, RuntimeException, Exception ) { if ( !isDocument() ) return Reference< XStream >(); @@ -815,7 +779,6 @@ Reference< XStream > Content::openWriteableStreamNoLock() bool Content::openStream( const Reference< XActiveDataSink >& rSink ) - throw( CommandAbortedException, RuntimeException, Exception ) { if ( !isDocument() ) return false; @@ -838,7 +801,6 @@ bool Content::openStream( const Reference< XActiveDataSink >& rSink ) bool Content::openStream( const Reference< XOutputStream >& rStream ) - throw( CommandAbortedException, RuntimeException, Exception ) { if ( !isDocument() ) return false; @@ -862,7 +824,6 @@ bool Content::openStream( const Reference< XOutputStream >& rStream ) void Content::writeStream( const Reference< XInputStream >& rStream, bool bReplaceExisting ) - throw( CommandAbortedException, RuntimeException, Exception ) { InsertCommandArgument aArg; aArg.Data = rStream.is() ? rStream : new EmptyInputStream; @@ -880,7 +841,6 @@ void Content::writeStream( const Reference< XInputStream >& rStream, Sequence< ContentInfo > Content::queryCreatableContentsInfo() - throw( CommandAbortedException, RuntimeException, Exception ) { // First, try it using "CreatableContentsInfo" property -> the "new" way. Sequence< ContentInfo > aInfo; @@ -904,7 +864,6 @@ bool Content::insertNewContent( const OUString& rContentType, rPropertyNames, const Sequence< Any >& rPropertyValues, Content& rNewContent ) - throw( CommandAbortedException, RuntimeException, Exception ) { return insertNewContent( rContentType, rPropertyNames, @@ -920,7 +879,6 @@ bool Content::insertNewContent( const OUString& rContentType, const Sequence< Any >& rPropertyValues, const Reference< XInputStream >& rData, Content& rNewContent ) - throw( CommandAbortedException, RuntimeException, Exception ) { if ( rContentType.isEmpty() ) return false; @@ -987,7 +945,6 @@ bool Content::transferContent( const Content& rSourceContent, const OUString & rVersionComment, OUString* pResultURL, const OUString & rDocumentId ) - throw( CommandAbortedException, RuntimeException, Exception ) { Reference< XUniversalContentBroker > pBroker( UniversalContentBroker::create( m_xImpl->getComponentContext() ) ); @@ -1048,7 +1005,6 @@ bool Content::transferContent( const Content& rSourceContent, bool Content::isFolder() - throw( CommandAbortedException, RuntimeException, Exception ) { bool bFolder = false; if ( getPropertyValue("IsFolder") @@ -1073,7 +1029,6 @@ bool Content::isFolder() SAL_WNOUNREACHABLE_CODE_PUSH bool Content::isDocument() - throw( CommandAbortedException, RuntimeException, Exception ) { bool bDoc = false; if ( getPropertyValue("IsDocument") @@ -1095,7 +1050,6 @@ bool Content::isDocument() SAL_WNOUNREACHABLE_CODE_POP void Content::lock() - throw( CommandAbortedException, RuntimeException, Exception ) { Command aCommand; aCommand.Name = "lock"; @@ -1106,7 +1060,6 @@ void Content::lock() } void Content::unlock() - throw( CommandAbortedException, RuntimeException, Exception ) { Command aCommand; @@ -1353,7 +1306,6 @@ void SAL_CALL ContentEventListener_Impl::release() } css::uno::Any SAL_CALL ContentEventListener_Impl::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< XContentEventListener* >(this)), @@ -1367,7 +1319,6 @@ css::uno::Any SAL_CALL ContentEventListener_Impl::queryInterface( const css::uno // virtual void SAL_CALL ContentEventListener_Impl::contentEvent( const ContentEvent& evt ) - throw( RuntimeException, std::exception ) { if ( evt.Source == m_rContent.m_xContent ) { @@ -1393,7 +1344,6 @@ void SAL_CALL ContentEventListener_Impl::contentEvent( const ContentEvent& evt ) // virtual void SAL_CALL ContentEventListener_Impl::disposing( const EventObject& Source ) - throw( RuntimeException, std::exception ) { m_rContent.disposing(Source); } diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx index 2ed226e0c30e..9cffc4909714 100644 --- a/ucbhelper/source/client/interceptedinteraction.cxx +++ b/ucbhelper/source/client/interceptedinteraction.cxx @@ -64,7 +64,6 @@ css::uno::Reference< css::task::XInteractionContinuation > InterceptedInteractio } void SAL_CALL InterceptedInteraction::handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest) - throw(css::uno::RuntimeException, std::exception) { impl_handleDefault(xRequest); } diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index 58d5a24d11b8..d40f572efb04 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -142,12 +142,10 @@ public: sal_Int32 nPort ) const; // XChangesListener - virtual void SAL_CALL changesOccurred( const util::ChangesEvent& Event ) - throw( uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL changesOccurred( const util::ChangesEvent& Event ) override; // XEventListener ( base of XChangesLisetenr ) - virtual void SAL_CALL disposing( const lang::EventObject& Source ) - throw( uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const lang::EventObject& Source ) override; private: void setNoProxyList( const OUString & rNoProxyList ); @@ -538,7 +536,6 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy( // virtual void SAL_CALL InternetProxyDecider_Impl::changesOccurred( const util::ChangesEvent& Event ) - throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -634,7 +631,6 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( // virtual void SAL_CALL InternetProxyDecider_Impl::disposing(const lang::EventObject&) - throw( uno::RuntimeException, std::exception ) { if ( m_xNotifier.is() ) { diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx index db1de0cc53d4..4fe2b8d4a490 100644 --- a/ucbhelper/source/provider/cancelcommandexecution.cxx +++ b/ucbhelper/source/provider/cancelcommandexecution.cxx @@ -43,7 +43,6 @@ namespace ucbhelper void cancelCommandExecution( const uno::Any & rException, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception ) { if ( xEnv.is() ) { @@ -87,7 +86,6 @@ void cancelCommandExecution( const ucb::IOErrorCode eError, const OUString & rMessage, const uno::Reference< ucb::XCommandProcessor > & xContext ) - throw( uno::Exception ) { rtl::Reference< ucbhelper::SimpleIOErrorRequest > xRequest = new ucbhelper::SimpleIOErrorRequest( diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx index 00ae20e5520b..6958419208d2 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/ucbhelper/source/provider/contenthelper.cxx @@ -157,7 +157,6 @@ void SAL_CALL ContentImplHelper::release() } uno::Any SAL_CALL ContentImplHelper::queryInterface( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, static_cast< lang::XTypeProvider * >(this), @@ -188,14 +187,12 @@ XTYPEPROVIDER_IMPL_10( ContentImplHelper, // virtual sal_Bool SAL_CALL ContentImplHelper::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } // virtual void SAL_CALL ContentImplHelper::dispose() - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -244,7 +241,6 @@ void SAL_CALL ContentImplHelper::dispose() // virtual void SAL_CALL ContentImplHelper::addEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -258,7 +254,6 @@ void SAL_CALL ContentImplHelper::addEventListener( // virtual void SAL_CALL ContentImplHelper::removeEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -269,7 +264,6 @@ void SAL_CALL ContentImplHelper::removeEventListener( // virtual uno::Reference< css::ucb::XContentIdentifier > SAL_CALL ContentImplHelper::getIdentifier() - throw( uno::RuntimeException, std::exception ) { return m_xIdentifier; } @@ -277,7 +271,6 @@ ContentImplHelper::getIdentifier() // virtual void SAL_CALL ContentImplHelper::addContentEventListener( const uno::Reference< css::ucb::XContentEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -291,7 +284,6 @@ void SAL_CALL ContentImplHelper::addContentEventListener( // virtual void SAL_CALL ContentImplHelper::removeContentEventListener( const uno::Reference< css::ucb::XContentEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -301,7 +293,6 @@ void SAL_CALL ContentImplHelper::removeContentEventListener( // virtual sal_Int32 SAL_CALL ContentImplHelper::createCommandIdentifier() - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -313,7 +304,6 @@ sal_Int32 SAL_CALL ContentImplHelper::createCommandIdentifier() void SAL_CALL ContentImplHelper::addPropertiesChangeListener( const uno::Sequence< OUString >& PropertyNames, const uno::Reference< beans::XPropertiesChangeListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -346,7 +336,6 @@ void SAL_CALL ContentImplHelper::addPropertiesChangeListener( void SAL_CALL ContentImplHelper::removePropertiesChangeListener( const uno::Sequence< OUString >& PropertyNames, const uno::Reference< beans::XPropertiesChangeListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -377,7 +366,6 @@ void SAL_CALL ContentImplHelper::removePropertiesChangeListener( // virtual void SAL_CALL ContentImplHelper::addCommandInfoChangeListener( const uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -391,7 +379,6 @@ void SAL_CALL ContentImplHelper::addCommandInfoChangeListener( // virtual void SAL_CALL ContentImplHelper::removeCommandInfoChangeListener( const uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -404,10 +391,6 @@ void SAL_CALL ContentImplHelper::addProperty( const OUString& Name, sal_Int16 Attributes, const uno::Any& DefaultValue ) - throw( beans::PropertyExistException, - beans::IllegalTypeException, - lang::IllegalArgumentException, - uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -492,9 +475,6 @@ void SAL_CALL ContentImplHelper::addProperty( // virtual void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name ) - throw( beans::UnknownPropertyException, - beans::NotRemoveableException, - uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -592,7 +572,6 @@ void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name ) // virtual void SAL_CALL ContentImplHelper::addPropertySetInfoChangeListener( const uno::Reference< beans::XPropertySetInfoChangeListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -606,7 +585,6 @@ void SAL_CALL ContentImplHelper::addPropertySetInfoChangeListener( // virtual void SAL_CALL ContentImplHelper::removePropertySetInfoChangeListener( const uno::Reference< beans::XPropertySetInfoChangeListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -616,7 +594,6 @@ void SAL_CALL ContentImplHelper::removePropertySetInfoChangeListener( // virtual uno::Reference< uno::XInterface > SAL_CALL ContentImplHelper::getParent() - throw( uno::RuntimeException, std::exception ) { uno::Reference< uno::XInterface > xParent; OUString aURL = getParentURL(); @@ -640,7 +617,6 @@ uno::Reference< uno::XInterface > SAL_CALL ContentImplHelper::getParent() // virtual void SAL_CALL ContentImplHelper::setParent( const uno::Reference< uno::XInterface >& ) - throw( lang::NoSupportException, uno::RuntimeException, std::exception ) { throw lang::NoSupportException(); } diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx index 24240278073a..16a682682365 100644 --- a/ucbhelper/source/provider/contentidentifier.cxx +++ b/ucbhelper/source/provider/contentidentifier.cxx @@ -104,7 +104,6 @@ void SAL_CALL ContentIdentifier::release() throw() // virtual Any SAL_CALL ContentIdentifier::queryInterface( const Type & rType ) - throw ( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, static_cast< XTypeProvider * >( this ), @@ -120,7 +119,6 @@ ContentIdentifier::queryInterface( const Type & rType ) // virtual Sequence< sal_Int8 > SAL_CALL ContentIdentifier::getImplementationId() - throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -129,7 +127,6 @@ ContentIdentifier::getImplementationId() // virtual Sequence< css::uno::Type > SAL_CALL ContentIdentifier::getTypes() - throw( RuntimeException, std::exception ) { static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) @@ -152,7 +149,6 @@ ContentIdentifier::getTypes() // virtual OUString SAL_CALL ContentIdentifier::getContentIdentifier() - throw( RuntimeException, std::exception ) { return m_pImpl->m_aContentId; } @@ -160,7 +156,6 @@ OUString SAL_CALL ContentIdentifier::getContentIdentifier() // virtual OUString SAL_CALL ContentIdentifier::getContentProviderScheme() - throw( RuntimeException, std::exception ) { return m_pImpl->m_aProviderScheme; } diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx index b4838831cc3c..b4ada7454845 100644 --- a/ucbhelper/source/provider/contentinfo.cxx +++ b/ucbhelper/source/provider/contentinfo.cxx @@ -69,7 +69,6 @@ void SAL_CALL PropertySetInfo::release() } css::uno::Any SAL_CALL PropertySetInfo::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -89,7 +88,6 @@ XTYPEPROVIDER_IMPL_2( PropertySetInfo, // virtual uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() - throw( uno::RuntimeException, std::exception ) { if ( !m_pProps ) { @@ -155,7 +153,6 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() // virtual beans::Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) - throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) { beans::Property aProp; if ( queryProperty( aName, aProp ) ) @@ -168,7 +165,6 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName( // virtual sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) - throw( uno::RuntimeException, std::exception ) { beans::Property aProp; return queryProperty( Name, aProp ); @@ -243,7 +239,6 @@ void SAL_CALL CommandProcessorInfo::release() } css::uno::Any SAL_CALL CommandProcessorInfo::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -266,7 +261,6 @@ XTYPEPROVIDER_IMPL_2( CommandProcessorInfo, // virtual uno::Sequence< css::ucb::CommandInfo > SAL_CALL CommandProcessorInfo::getCommands() - throw( uno::RuntimeException, std::exception ) { if ( !m_pCommands ) { @@ -301,8 +295,6 @@ CommandProcessorInfo::getCommands() css::ucb::CommandInfo SAL_CALL CommandProcessorInfo::getCommandInfoByName( const OUString& Name ) - throw( css::ucb::UnsupportedCommandException, - uno::RuntimeException, std::exception ) { css::ucb::CommandInfo aInfo; if ( queryCommand( Name, aInfo ) ) @@ -315,8 +307,6 @@ CommandProcessorInfo::getCommandInfoByName( // virtual css::ucb::CommandInfo SAL_CALL CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle ) - throw( css::ucb::UnsupportedCommandException, - uno::RuntimeException, std::exception ) { css::ucb::CommandInfo aInfo; if ( queryCommand( Handle, aInfo ) ) @@ -329,7 +319,6 @@ CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle ) // virtual sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName( const OUString& Name ) - throw( uno::RuntimeException, std::exception ) { css::ucb::CommandInfo aInfo; return queryCommand( Name, aInfo ); @@ -338,7 +327,6 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName( // virtual sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle ) - throw( uno::RuntimeException, std::exception ) { css::ucb::CommandInfo aInfo; return queryCommand( Handle, aInfo ); diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx index d22b2b651730..c98884087c07 100644 --- a/ucbhelper/source/provider/fd_inputstream.cxx +++ b/ucbhelper/source/provider/fd_inputstream.cxx @@ -56,10 +56,6 @@ namespace ucbhelper sal_Int32 SAL_CALL FdInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw(NotConnectedException, - BufferSizeExceededException, - IOException, - RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); @@ -84,20 +80,12 @@ namespace ucbhelper sal_Int32 SAL_CALL FdInputStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( NotConnectedException, - BufferSizeExceededException, - IOException, - RuntimeException, std::exception) { return readBytes(aData,nMaxBytesToRead); } void SAL_CALL FdInputStream::skipBytes(sal_Int32 nBytesToSkip) - throw(NotConnectedException, - BufferSizeExceededException, - IOException, - RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); if(!m_tmpfl) @@ -109,18 +97,12 @@ namespace ucbhelper sal_Int32 SAL_CALL FdInputStream::available() - throw(NotConnectedException, - IOException, - RuntimeException, std::exception) { return sal::static_int_cast<sal_Int32>(m_nLength - getPosition()); } void SAL_CALL FdInputStream::closeInput() - throw(NotConnectedException, - IOException, - RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); if(m_tmpfl) @@ -132,9 +114,6 @@ namespace ucbhelper void SAL_CALL FdInputStream::seek(sal_Int64 location) - throw( IllegalArgumentException, - IOException, - RuntimeException, std::exception ) { osl::MutexGuard aGuard(m_aMutex); if(!m_tmpfl) @@ -147,8 +126,6 @@ namespace ucbhelper sal_Int64 SAL_CALL FdInputStream::getPosition() - throw( IOException, - RuntimeException, std::exception ) { osl::MutexGuard aGuard(m_aMutex); if(!m_tmpfl) @@ -161,7 +138,6 @@ namespace ucbhelper sal_Int64 SAL_CALL FdInputStream::getLength() - throw( IOException,RuntimeException, std::exception ) { return m_nLength; } diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index c8d0858bea18..5738187bdf0f 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -124,7 +124,6 @@ void SAL_CALL InteractionRequest::release() // virtual uno::Any SAL_CALL InteractionRequest::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, static_cast< lang::XTypeProvider * >( this ), @@ -139,7 +138,6 @@ InteractionRequest::queryInterface( const uno::Type & rType ) // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionRequest::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -147,7 +145,6 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionRequest::getImplementationId() // virtual uno::Sequence< uno::Type > SAL_CALL InteractionRequest::getTypes() - throw( uno::RuntimeException, std::exception ) { static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) @@ -170,7 +167,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionRequest::getTypes() // virtual uno::Any SAL_CALL InteractionRequest::getRequest() - throw( uno::RuntimeException, std::exception ) { return m_pImpl->m_aRequest; } @@ -179,7 +175,6 @@ uno::Any SAL_CALL InteractionRequest::getRequest() // virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL InteractionRequest::getContinuations() - throw( uno::RuntimeException, std::exception ) { return m_pImpl->m_aContinuations; } @@ -232,7 +227,6 @@ void SAL_CALL InteractionAbort::release() // virtual uno::Any SAL_CALL InteractionAbort::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, static_cast< lang::XTypeProvider * >( this ), @@ -249,7 +243,6 @@ InteractionAbort::queryInterface( const uno::Type & rType ) // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionAbort::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -257,7 +250,6 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionAbort::getImplementationId() // virtual uno::Sequence< uno::Type > SAL_CALL InteractionAbort::getTypes() - throw( uno::RuntimeException, std::exception ) { static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) @@ -280,7 +272,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionAbort::getTypes() // virtual void SAL_CALL InteractionAbort::select() - throw( uno::RuntimeException, std::exception ) { recordSelection(); } @@ -311,7 +302,6 @@ void SAL_CALL InteractionRetry::release() // virtual uno::Any SAL_CALL InteractionRetry::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, static_cast< lang::XTypeProvider * >( this ), @@ -328,7 +318,6 @@ InteractionRetry::queryInterface( const uno::Type & rType ) // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionRetry::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -336,7 +325,6 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionRetry::getImplementationId() // virtual uno::Sequence< uno::Type > SAL_CALL InteractionRetry::getTypes() - throw( uno::RuntimeException, std::exception ) { static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) @@ -359,7 +347,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionRetry::getTypes() // virtual void SAL_CALL InteractionRetry::select() - throw( uno::RuntimeException, std::exception ) { recordSelection(); } @@ -390,7 +377,6 @@ void SAL_CALL InteractionApprove::release() // virtual uno::Any SAL_CALL InteractionApprove::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, static_cast< lang::XTypeProvider * >( this ), @@ -407,7 +393,6 @@ InteractionApprove::queryInterface( const uno::Type & rType ) // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionApprove::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -415,7 +400,6 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionApprove::getImplementationId() // virtual uno::Sequence< uno::Type > SAL_CALL InteractionApprove::getTypes() - throw( uno::RuntimeException, std::exception ) { static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) @@ -438,7 +422,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionApprove::getTypes() // virtual void SAL_CALL InteractionApprove::select() - throw( uno::RuntimeException, std::exception ) { recordSelection(); } @@ -469,7 +452,6 @@ void SAL_CALL InteractionDisapprove::release() // virtual uno::Any SAL_CALL InteractionDisapprove::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, static_cast< lang::XTypeProvider * >( this ), @@ -486,7 +468,6 @@ InteractionDisapprove::queryInterface( const uno::Type & rType ) // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionDisapprove::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -494,7 +475,6 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionDisapprove::getImplementationId() // virtual uno::Sequence< uno::Type > SAL_CALL InteractionDisapprove::getTypes() - throw( uno::RuntimeException, std::exception ) { static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) @@ -517,7 +497,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionDisapprove::getTypes() // virtual void SAL_CALL InteractionDisapprove::select() - throw( uno::RuntimeException, std::exception ) { recordSelection(); } @@ -548,7 +527,6 @@ void SAL_CALL InteractionSupplyAuthentication::release() // virtual uno::Any SAL_CALL InteractionSupplyAuthentication::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, static_cast< lang::XTypeProvider * >( this ), @@ -567,7 +545,6 @@ InteractionSupplyAuthentication::queryInterface( const uno::Type & rType ) // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyAuthentication::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -575,7 +552,6 @@ InteractionSupplyAuthentication::getImplementationId() // virtual uno::Sequence< uno::Type > SAL_CALL InteractionSupplyAuthentication::getTypes() - throw( uno::RuntimeException, std::exception ) { static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) @@ -598,7 +574,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyAuthentication::getTypes() // virtual void SAL_CALL InteractionSupplyAuthentication::select() - throw( uno::RuntimeException, std::exception ) { recordSelection(); } @@ -610,7 +585,6 @@ void SAL_CALL InteractionSupplyAuthentication::select() // virtual sal_Bool SAL_CALL InteractionSupplyAuthentication::canSetRealm() - throw( uno::RuntimeException, std::exception ) { return m_bCanSetRealm; } @@ -619,7 +593,6 @@ InteractionSupplyAuthentication::canSetRealm() // virtual void SAL_CALL InteractionSupplyAuthentication::setRealm( const OUString& Realm ) - throw( uno::RuntimeException, std::exception ) { OSL_ENSURE( m_bCanSetPassword, "InteractionSupplyAuthentication::setRealm - Not supported!" ); @@ -632,7 +605,6 @@ InteractionSupplyAuthentication::setRealm( const OUString& Realm ) // virtual sal_Bool SAL_CALL InteractionSupplyAuthentication::canSetUserName() - throw( uno::RuntimeException, std::exception ) { return m_bCanSetUserName; } @@ -641,7 +613,6 @@ InteractionSupplyAuthentication::canSetUserName() // virtual void SAL_CALL InteractionSupplyAuthentication::setUserName( const OUString& UserName ) - throw( uno::RuntimeException, std::exception ) { OSL_ENSURE( m_bCanSetUserName, "InteractionSupplyAuthentication::setUserName - Not supported!" ); @@ -654,7 +625,6 @@ InteractionSupplyAuthentication::setUserName( const OUString& UserName ) // virtual sal_Bool SAL_CALL InteractionSupplyAuthentication::canSetPassword() - throw( uno::RuntimeException, std::exception ) { return m_bCanSetPassword; } @@ -663,7 +633,6 @@ InteractionSupplyAuthentication::canSetPassword() // virtual void SAL_CALL InteractionSupplyAuthentication::setPassword( const OUString& Password ) - throw( uno::RuntimeException, std::exception ) { OSL_ENSURE( m_bCanSetPassword, "InteractionSupplyAuthentication::setPassword - Not supported!" ); @@ -677,7 +646,6 @@ InteractionSupplyAuthentication::setPassword( const OUString& Password ) uno::Sequence< ucb::RememberAuthentication > SAL_CALL InteractionSupplyAuthentication::getRememberPasswordModes( ucb::RememberAuthentication& Default ) - throw( uno::RuntimeException, std::exception ) { Default = m_eDefaultRememberPasswordMode; return m_aRememberPasswordModes; @@ -688,7 +656,6 @@ InteractionSupplyAuthentication::getRememberPasswordModes( void SAL_CALL InteractionSupplyAuthentication::setRememberPassword( ucb::RememberAuthentication Remember ) - throw( uno::RuntimeException, std::exception ) { m_eRememberPasswordMode = Remember; } @@ -697,7 +664,6 @@ InteractionSupplyAuthentication::setRememberPassword( // virtual sal_Bool SAL_CALL InteractionSupplyAuthentication::canSetAccount() - throw( uno::RuntimeException, std::exception ) { return m_bCanSetAccount; } @@ -706,7 +672,6 @@ InteractionSupplyAuthentication::canSetAccount() // virtual void SAL_CALL InteractionSupplyAuthentication::setAccount( const OUString& Account ) - throw( uno::RuntimeException, std::exception ) { OSL_ENSURE( m_bCanSetAccount, "InteractionSupplyAuthentication::setAccount - Not supported!" ); @@ -720,7 +685,6 @@ InteractionSupplyAuthentication::setAccount( const OUString& Account ) uno::Sequence< ucb::RememberAuthentication > SAL_CALL InteractionSupplyAuthentication::getRememberAccountModes( ucb::RememberAuthentication& Default ) - throw( uno::RuntimeException, std::exception ) { Default = m_eDefaultRememberAccountMode; return m_aRememberAccountModes; @@ -730,7 +694,6 @@ InteractionSupplyAuthentication::getRememberAccountModes( // virtual void SAL_CALL InteractionSupplyAuthentication::setRememberAccount( ucb::RememberAuthentication Remember ) - throw( uno::RuntimeException, std::exception ) { m_eRememberAccountMode = Remember; } @@ -743,7 +706,6 @@ void SAL_CALL InteractionSupplyAuthentication::setRememberAccount( sal_Bool SAL_CALL InteractionSupplyAuthentication::canUseSystemCredentials( sal_Bool& Default ) - throw ( uno::RuntimeException, std::exception ) { Default = false; return m_bCanUseSystemCredentials; @@ -753,7 +715,6 @@ InteractionSupplyAuthentication::canUseSystemCredentials( // virtual void SAL_CALL InteractionSupplyAuthentication::setUseSystemCredentials( sal_Bool UseSystemCredentials ) - throw ( uno::RuntimeException, std::exception ) { if ( m_bCanUseSystemCredentials ) m_bUseSystemCredentials = UseSystemCredentials; @@ -785,7 +746,6 @@ void SAL_CALL InteractionReplaceExistingData::release() // virtual uno::Any SAL_CALL InteractionReplaceExistingData::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, static_cast< lang::XTypeProvider * >( this ), @@ -803,7 +763,6 @@ InteractionReplaceExistingData::queryInterface( const uno::Type & rType ) // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionReplaceExistingData::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -811,7 +770,6 @@ InteractionReplaceExistingData::getImplementationId() // virtual uno::Sequence< uno::Type > SAL_CALL InteractionReplaceExistingData::getTypes() - throw( uno::RuntimeException, std::exception ) { static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) @@ -834,7 +792,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionReplaceExistingData::getTypes() // virtual void SAL_CALL InteractionReplaceExistingData::select() - throw( uno::RuntimeException, std::exception ) { recordSelection(); } @@ -860,7 +817,6 @@ void SAL_CALL InteractionAuthFallback::release() // virtual uno::Any SAL_CALL InteractionAuthFallback::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, static_cast< task::XInteractionContinuation * >( this ), @@ -874,7 +830,6 @@ InteractionAuthFallback::queryInterface( const uno::Type & rType ) // virtual void SAL_CALL InteractionAuthFallback::select() - throw( uno::RuntimeException, std::exception ) { recordSelection(); } @@ -883,13 +838,11 @@ void SAL_CALL InteractionAuthFallback::select() // virtual void SAL_CALL InteractionAuthFallback::setCode( const OUString& code ) - throw ( uno::RuntimeException, std::exception ) { m_aCode = code; } const OUString& SAL_CALL InteractionAuthFallback::getCode( ) - throw ( uno::RuntimeException, std::exception ) { return m_aCode; } diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx index 5f836d149327..b375ab96b21b 100644 --- a/ucbhelper/source/provider/propertyvalueset.cxx +++ b/ucbhelper/source/provider/propertyvalueset.cxx @@ -259,7 +259,6 @@ void SAL_CALL PropertyValueSet::release() } css::uno::Any SAL_CALL PropertyValueSet::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< XTypeProvider* >(this)), @@ -283,7 +282,6 @@ XTYPEPROVIDER_IMPL_3( PropertyValueSet, // virtual sal_Bool SAL_CALL PropertyValueSet::wasNull() - throw( SQLException, RuntimeException, std::exception ) { // This method can not be implemented correctly!!! Imagine different // threads doing a getXYZ - wasNull calling sequence on the same @@ -294,7 +292,6 @@ sal_Bool SAL_CALL PropertyValueSet::wasNull() // virtual OUString SAL_CALL PropertyValueSet::getString( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( OUString, PropsSet::String, aString ); } @@ -302,7 +299,6 @@ OUString SAL_CALL PropertyValueSet::getString( sal_Int32 columnIndex ) // virtual sal_Bool SAL_CALL PropertyValueSet::getBoolean( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( bool, PropsSet::Boolean, bBoolean ); } @@ -310,7 +306,6 @@ sal_Bool SAL_CALL PropertyValueSet::getBoolean( sal_Int32 columnIndex ) // virtual sal_Int8 SAL_CALL PropertyValueSet::getByte( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( sal_Int8, PropsSet::Byte, nByte ); } @@ -318,7 +313,6 @@ sal_Int8 SAL_CALL PropertyValueSet::getByte( sal_Int32 columnIndex ) // virtual sal_Int16 SAL_CALL PropertyValueSet::getShort( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( sal_Int16, PropsSet::Short, nShort ); } @@ -326,7 +320,6 @@ sal_Int16 SAL_CALL PropertyValueSet::getShort( sal_Int32 columnIndex ) // virtual sal_Int32 SAL_CALL PropertyValueSet::getInt( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( sal_Int32, PropsSet::Int, nInt ); } @@ -334,7 +327,6 @@ sal_Int32 SAL_CALL PropertyValueSet::getInt( sal_Int32 columnIndex ) // virtual sal_Int64 SAL_CALL PropertyValueSet::getLong( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( sal_Int64, PropsSet::Long, nLong ); } @@ -342,7 +334,6 @@ sal_Int64 SAL_CALL PropertyValueSet::getLong( sal_Int32 columnIndex ) // virtual float SAL_CALL PropertyValueSet::getFloat( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( float, PropsSet::Float, nFloat ); } @@ -350,7 +341,6 @@ float SAL_CALL PropertyValueSet::getFloat( sal_Int32 columnIndex ) // virtual double SAL_CALL PropertyValueSet::getDouble( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( double, PropsSet::Double, nDouble ); } @@ -359,7 +349,6 @@ double SAL_CALL PropertyValueSet::getDouble( sal_Int32 columnIndex ) // virtual Sequence< sal_Int8 > SAL_CALL PropertyValueSet::getBytes( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( Sequence< sal_Int8 >, PropsSet::Bytes, aBytes ); } @@ -367,7 +356,6 @@ PropertyValueSet::getBytes( sal_Int32 columnIndex ) // virtual Date SAL_CALL PropertyValueSet::getDate( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( Date, PropsSet::Date, aDate ); } @@ -375,7 +363,6 @@ Date SAL_CALL PropertyValueSet::getDate( sal_Int32 columnIndex ) // virtual Time SAL_CALL PropertyValueSet::getTime( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( Time, PropsSet::Time, aTime ); } @@ -383,7 +370,6 @@ Time SAL_CALL PropertyValueSet::getTime( sal_Int32 columnIndex ) // virtual DateTime SAL_CALL PropertyValueSet::getTimestamp( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( DateTime, PropsSet::Timestamp, aTimestamp ); } @@ -392,7 +378,6 @@ DateTime SAL_CALL PropertyValueSet::getTimestamp( sal_Int32 columnIndex ) // virtual Reference< XInputStream > SAL_CALL PropertyValueSet::getBinaryStream( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( Reference< XInputStream >, PropsSet::BinaryStream, xBinaryStream ); @@ -402,7 +387,6 @@ PropertyValueSet::getBinaryStream( sal_Int32 columnIndex ) // virtual Reference< XInputStream > SAL_CALL PropertyValueSet::getCharacterStream( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( Reference< XInputStream >, PropsSet::CharacterStream, xCharacterStream ); @@ -413,7 +397,6 @@ PropertyValueSet::getCharacterStream( sal_Int32 columnIndex ) Any SAL_CALL PropertyValueSet::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& ) - throw( SQLException, RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -541,7 +524,6 @@ Any SAL_CALL PropertyValueSet::getObject( // virtual Reference< XRef > SAL_CALL PropertyValueSet::getRef( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( Reference< XRef >, PropsSet::Ref, xRef ); } @@ -549,7 +531,6 @@ Reference< XRef > SAL_CALL PropertyValueSet::getRef( sal_Int32 columnIndex ) // virtual Reference< XBlob > SAL_CALL PropertyValueSet::getBlob( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( Reference< XBlob >, PropsSet::Blob, xBlob ); } @@ -557,7 +538,6 @@ Reference< XBlob > SAL_CALL PropertyValueSet::getBlob( sal_Int32 columnIndex ) // virtual Reference< XClob > SAL_CALL PropertyValueSet::getClob( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( Reference< XClob >, PropsSet::Clob, xClob ); } @@ -565,7 +545,6 @@ Reference< XClob > SAL_CALL PropertyValueSet::getClob( sal_Int32 columnIndex ) // virtual Reference< XArray > SAL_CALL PropertyValueSet::getArray( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { GETVALUE_IMPL( Reference< XArray >, PropsSet::Array, xArray ); } @@ -576,7 +555,6 @@ Reference< XArray > SAL_CALL PropertyValueSet::getArray( sal_Int32 columnIndex ) // virtual sal_Int32 SAL_CALL PropertyValueSet::findColumn( const OUString& columnName ) - throw( SQLException, RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx index c4148fc82996..2fd42abc079d 100644 --- a/ucbhelper/source/provider/providerhelper.cxx +++ b/ucbhelper/source/provider/providerhelper.cxx @@ -83,7 +83,6 @@ void SAL_CALL ContentProviderImplHelper::release() } css::uno::Any SAL_CALL ContentProviderImplHelper::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -101,7 +100,6 @@ XTYPEPROVIDER_IMPL_3( ContentProviderImplHelper, // virtual sal_Bool SAL_CALL ContentProviderImplHelper::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } @@ -110,7 +108,6 @@ sal_Bool SAL_CALL ContentProviderImplHelper::supportsService( sal_Int32 SAL_CALL ContentProviderImplHelper::compareContentIds( const uno::Reference< css::ucb::XContentIdentifier >& Id1, const uno::Reference< css::ucb::XContentIdentifier >& Id2 ) - throw( uno::RuntimeException, std::exception ) { // Simply do a string compare. diff --git a/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx index edd19b47d950..8c5d19c2ca63 100644 --- a/ucbhelper/source/provider/registerucb.cxx +++ b/ucbhelper/source/provider/registerucb.cxx @@ -44,7 +44,6 @@ registerAtUcb( OUString const & rName, OUString const & rArguments, OUString const & rTemplate) - throw (uno::RuntimeException) { OSL_ENSURE(rxContext.is(), "ucb::registerAtUcb(): No service factory"); diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 2bf8c54dc45c..b4ba14f7e3f6 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -95,27 +95,21 @@ public: sal_Int32 nProps ); // 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; // XPropertySetInfo - virtual uno::Sequence< beans::Property > SAL_CALL getProperties() - throw( uno::RuntimeException, std::exception ) override; + virtual uno::Sequence< beans::Property > SAL_CALL getProperties() override; virtual beans::Property SAL_CALL getPropertyByName( - const OUString& aName ) - throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( uno::RuntimeException, std::exception ) override; + const OUString& aName ) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override; }; typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString> @@ -236,7 +230,6 @@ void SAL_CALL ResultSet::release() } css::uno::Any SAL_CALL ResultSet::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -270,19 +263,16 @@ XTYPEPROVIDER_IMPL_9( ResultSet, // XServiceInfo methods. OUString SAL_CALL ResultSet::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString( "ResultSet" ); } sal_Bool SAL_CALL ResultSet::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL ResultSet::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { RESULTSET_SERVICE_NAME }; } @@ -293,7 +283,6 @@ css::uno::Sequence< OUString > SAL_CALL ResultSet::getSupportedServiceNames() // virtual void SAL_CALL ResultSet::dispose() - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -319,7 +308,6 @@ void SAL_CALL ResultSet::dispose() // virtual void SAL_CALL ResultSet::addEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -334,7 +322,6 @@ void SAL_CALL ResultSet::addEventListener( // virtual void SAL_CALL ResultSet::removeEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -348,7 +335,6 @@ void SAL_CALL ResultSet::removeEventListener( // virtual uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -365,7 +351,6 @@ uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData() // virtual sal_Bool SAL_CALL ResultSet::next() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { // Note: Cursor is initially positioned before the first row. // First call to 'next()' moves it to first row. @@ -394,7 +379,6 @@ sal_Bool SAL_CALL ResultSet::next() // virtual sal_Bool SAL_CALL ResultSet::isBeforeFirst() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_bAfterLast ) { @@ -416,7 +400,6 @@ sal_Bool SAL_CALL ResultSet::isBeforeFirst() // virtual sal_Bool SAL_CALL ResultSet::isAfterLast() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->validate(); return m_pImpl->m_bAfterLast; @@ -425,7 +408,6 @@ sal_Bool SAL_CALL ResultSet::isAfterLast() // virtual sal_Bool SAL_CALL ResultSet::isFirst() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_bAfterLast ) { @@ -440,7 +422,6 @@ sal_Bool SAL_CALL ResultSet::isFirst() // virtual sal_Bool SAL_CALL ResultSet::isLast() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_bAfterLast ) { @@ -462,7 +443,6 @@ sal_Bool SAL_CALL ResultSet::isLast() // virtual void SAL_CALL ResultSet::beforeFirst() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); m_pImpl->m_bAfterLast = false; @@ -473,7 +453,6 @@ void SAL_CALL ResultSet::beforeFirst() // virtual void SAL_CALL ResultSet::afterLast() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); m_pImpl->m_bAfterLast = true; @@ -483,7 +462,6 @@ void SAL_CALL ResultSet::afterLast() // virtual sal_Bool SAL_CALL ResultSet::first() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { // getResult works zero-based! if ( m_pImpl->m_xDataSupplier->getResult( 0 ) ) @@ -502,7 +480,6 @@ sal_Bool SAL_CALL ResultSet::first() // virtual sal_Bool SAL_CALL ResultSet::last() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { sal_Int32 nCount = m_pImpl->m_xDataSupplier->totalCount(); if ( nCount ) @@ -521,7 +498,6 @@ sal_Bool SAL_CALL ResultSet::last() // virtual sal_Int32 SAL_CALL ResultSet::getRow() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_bAfterLast ) { @@ -536,7 +512,6 @@ sal_Int32 SAL_CALL ResultSet::getRow() // virtual sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { /* If the row number is positive, the cursor moves to the given row number @@ -609,7 +584,6 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row ) // virtual sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { /* Attempting to move beyond the first/last row in the result set @@ -679,7 +653,6 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows ) // virtual sal_Bool SAL_CALL ResultSet::previous() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { /* previous() is not the same as relative( -1 ) because it makes sense @@ -709,7 +682,6 @@ sal_Bool SAL_CALL ResultSet::previous() // virtual void SAL_CALL ResultSet::refreshRow() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); if ( m_pImpl->m_bAfterLast || ( m_pImpl->m_nPos == 0 ) ) @@ -722,7 +694,6 @@ void SAL_CALL ResultSet::refreshRow() // virtual sal_Bool SAL_CALL ResultSet::rowUpdated() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->validate(); return false; @@ -731,7 +702,6 @@ sal_Bool SAL_CALL ResultSet::rowUpdated() // virtual sal_Bool SAL_CALL ResultSet::rowInserted() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->validate(); return false; @@ -740,7 +710,6 @@ sal_Bool SAL_CALL ResultSet::rowInserted() // virtual sal_Bool SAL_CALL ResultSet::rowDeleted() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->validate(); return false; @@ -749,7 +718,6 @@ sal_Bool SAL_CALL ResultSet::rowDeleted() // virtual uno::Reference< uno::XInterface > SAL_CALL ResultSet::getStatement() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { /* returns the Statement that produced this ResultSet object. If the @@ -765,7 +733,6 @@ uno::Reference< uno::XInterface > SAL_CALL ResultSet::getStatement() // virtual sal_Bool SAL_CALL ResultSet::wasNull() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { // This method can not be implemented correctly!!! Imagine different // threads doing a getXYZ - wasNull calling sequence on the same @@ -790,7 +757,6 @@ sal_Bool SAL_CALL ResultSet::wasNull() // virtual OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -813,7 +779,6 @@ OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex ) // virtual sal_Bool SAL_CALL ResultSet::getBoolean( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -836,7 +801,6 @@ sal_Bool SAL_CALL ResultSet::getBoolean( sal_Int32 columnIndex ) // virtual sal_Int8 SAL_CALL ResultSet::getByte( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -859,7 +823,6 @@ sal_Int8 SAL_CALL ResultSet::getByte( sal_Int32 columnIndex ) // virtual sal_Int16 SAL_CALL ResultSet::getShort( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -882,7 +845,6 @@ sal_Int16 SAL_CALL ResultSet::getShort( sal_Int32 columnIndex ) // virtual sal_Int32 SAL_CALL ResultSet::getInt( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -905,7 +867,6 @@ sal_Int32 SAL_CALL ResultSet::getInt( sal_Int32 columnIndex ) // virtual sal_Int64 SAL_CALL ResultSet::getLong( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -928,7 +889,6 @@ sal_Int64 SAL_CALL ResultSet::getLong( sal_Int32 columnIndex ) // virtual float SAL_CALL ResultSet::getFloat( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -951,7 +911,6 @@ float SAL_CALL ResultSet::getFloat( sal_Int32 columnIndex ) // virtual double SAL_CALL ResultSet::getDouble( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -975,7 +934,6 @@ double SAL_CALL ResultSet::getDouble( sal_Int32 columnIndex ) // virtual uno::Sequence< sal_Int8 > SAL_CALL ResultSet::getBytes( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -998,7 +956,6 @@ ResultSet::getBytes( sal_Int32 columnIndex ) // virtual util::Date SAL_CALL ResultSet::getDate( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1021,7 +978,6 @@ util::Date SAL_CALL ResultSet::getDate( sal_Int32 columnIndex ) // virtual util::Time SAL_CALL ResultSet::getTime( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1045,7 +1001,6 @@ util::Time SAL_CALL ResultSet::getTime( sal_Int32 columnIndex ) // virtual util::DateTime SAL_CALL ResultSet::getTimestamp( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1069,7 +1024,6 @@ ResultSet::getTimestamp( sal_Int32 columnIndex ) // virtual uno::Reference< io::XInputStream > SAL_CALL ResultSet::getBinaryStream( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1093,7 +1047,6 @@ ResultSet::getBinaryStream( sal_Int32 columnIndex ) // virtual uno::Reference< io::XInputStream > SAL_CALL ResultSet::getCharacterStream( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1118,7 +1071,6 @@ ResultSet::getCharacterStream( sal_Int32 columnIndex ) uno::Any SAL_CALL ResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< container::XNameAccess >& typeMap ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1142,7 +1094,6 @@ uno::Any SAL_CALL ResultSet::getObject( // virtual uno::Reference< sdbc::XRef > SAL_CALL ResultSet::getRef( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1166,7 +1117,6 @@ ResultSet::getRef( sal_Int32 columnIndex ) // virtual uno::Reference< sdbc::XBlob > SAL_CALL ResultSet::getBlob( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1190,7 +1140,6 @@ ResultSet::getBlob( sal_Int32 columnIndex ) // virtual uno::Reference< sdbc::XClob > SAL_CALL ResultSet::getClob( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1214,7 +1163,6 @@ ResultSet::getClob( sal_Int32 columnIndex ) // virtual uno::Reference< sdbc::XArray > SAL_CALL ResultSet::getArray( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1240,7 +1188,6 @@ ResultSet::getArray( sal_Int32 columnIndex ) // virtual void SAL_CALL ResultSet::close() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->close(); m_pImpl->m_xDataSupplier->validate(); @@ -1252,7 +1199,6 @@ void SAL_CALL ResultSet::close() // virtual OUString SAL_CALL ResultSet::queryContentIdentifierString() - throw( uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) return m_pImpl->m_xDataSupplier->queryContentIdentifierString( @@ -1265,7 +1211,6 @@ OUString SAL_CALL ResultSet::queryContentIdentifierString() // virtual uno::Reference< css::ucb::XContentIdentifier > SAL_CALL ResultSet::queryContentIdentifier() - throw( uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) return m_pImpl->m_xDataSupplier->queryContentIdentifier( @@ -1278,7 +1223,6 @@ ResultSet::queryContentIdentifier() // virtual uno::Reference< css::ucb::XContent > SAL_CALL ResultSet::queryContent() - throw( uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) return m_pImpl->m_xDataSupplier->queryContent( m_pImpl->m_nPos - 1 ); @@ -1293,7 +1237,6 @@ ResultSet::queryContent() // virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL ResultSet::getPropertySetInfo() - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -1308,11 +1251,6 @@ ResultSet::getPropertySetInfo() // virtual void SAL_CALL ResultSet::setPropertyValue( const OUString& aPropertyName, const uno::Any& ) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { if ( aPropertyName.isEmpty() ) throw beans::UnknownPropertyException(); @@ -1337,9 +1275,6 @@ void SAL_CALL ResultSet::setPropertyValue( const OUString& aPropertyName, // virtual uno::Any SAL_CALL ResultSet::getPropertyValue( const OUString& PropertyName ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { if ( PropertyName.isEmpty() ) throw beans::UnknownPropertyException(); @@ -1367,9 +1302,6 @@ uno::Any SAL_CALL ResultSet::getPropertyValue( void SAL_CALL ResultSet::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { // Note: An empty property name means a listener for "all" properties. @@ -1393,9 +1325,6 @@ void SAL_CALL ResultSet::addPropertyChangeListener( void SAL_CALL ResultSet::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -1415,9 +1344,6 @@ void SAL_CALL ResultSet::removePropertyChangeListener( void SAL_CALL ResultSet::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { // No constrained props, at the moment. } @@ -1427,9 +1353,6 @@ void SAL_CALL ResultSet::addVetoableChangeListener( void SAL_CALL ResultSet::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { // No constrained props, at the moment. } @@ -1565,7 +1488,6 @@ void SAL_CALL PropertySetInfo::release() css::uno::Any SAL_CALL PropertySetInfo::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -1587,7 +1509,6 @@ XTYPEPROVIDER_IMPL_2( PropertySetInfo, // virtual uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() - throw( uno::RuntimeException, std::exception ) { return uno::Sequence< beans::Property >( *m_pProps ); } @@ -1596,7 +1517,6 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() // virtual beans::Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) - throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) { beans::Property aProp; if ( queryProperty( aName, aProp ) ) @@ -1609,7 +1529,6 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName( // virtual sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) - throw( uno::RuntimeException, std::exception ) { beans::Property aProp; return queryProperty( Name, aProp ); diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx index 314e4e6e6d58..9013b13ba43c 100644 --- a/ucbhelper/source/provider/resultsethelper.cxx +++ b/ucbhelper/source/provider/resultsethelper.cxx @@ -77,7 +77,6 @@ void SAL_CALL ResultSetImplHelper::release() } css::uno::Any SAL_CALL ResultSetImplHelper::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -100,19 +99,16 @@ XTYPEPROVIDER_IMPL_3( ResultSetImplHelper, // XServiceInfo methods. OUString SAL_CALL ResultSetImplHelper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString( "ResultSetImplHelper" ); } sal_Bool SAL_CALL ResultSetImplHelper::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL ResultSetImplHelper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { DYNAMICRESULTSET_SERVICE_NAME }; } @@ -122,7 +118,6 @@ css::uno::Sequence< OUString > SAL_CALL ResultSetImplHelper::getSupportedService // virtual void SAL_CALL ResultSetImplHelper::dispose() - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -138,7 +133,6 @@ void SAL_CALL ResultSetImplHelper::dispose() // virtual void SAL_CALL ResultSetImplHelper::addEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -152,7 +146,6 @@ void SAL_CALL ResultSetImplHelper::addEventListener( // virtual void SAL_CALL ResultSetImplHelper::removeEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -167,8 +160,6 @@ void SAL_CALL ResultSetImplHelper::removeEventListener( // virtual uno::Reference< sdbc::XResultSet > SAL_CALL ResultSetImplHelper::getStaticResultSet() - throw( css::ucb::ListenerAlreadySetException, - uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -183,8 +174,6 @@ ResultSetImplHelper::getStaticResultSet() // virtual void SAL_CALL ResultSetImplHelper::setListener( const uno::Reference< css::ucb::XDynamicResultSetListener >& Listener ) - throw( css::ucb::ListenerAlreadySetException, - uno::RuntimeException, std::exception ) { osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -225,7 +214,6 @@ void SAL_CALL ResultSetImplHelper::setListener( // virtual sal_Int16 SAL_CALL ResultSetImplHelper::getCapabilities() - throw( uno::RuntimeException, std::exception ) { // ! css::ucb::ContentResultSetCapability::SORTED return 0; @@ -235,10 +223,6 @@ sal_Int16 SAL_CALL ResultSetImplHelper::getCapabilities() // virtual void SAL_CALL ResultSetImplHelper::connectToCache( const uno::Reference< css::ucb::XDynamicResultSet > & xCache ) - throw( css::ucb::ListenerAlreadySetException, - css::ucb::AlreadyInitializedException, - css::ucb::ServiceNotFoundException, - uno::RuntimeException, std::exception ) { if ( m_xListener.is() ) throw css::ucb::ListenerAlreadySetException(); diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx index fe36117b1eba..5c35d84c6f6e 100644 --- a/ucbhelper/source/provider/resultsetmetadata.cxx +++ b/ucbhelper/source/provider/resultsetmetadata.cxx @@ -119,7 +119,6 @@ void SAL_CALL ResultSetMetaData::release() } css::uno::Any SAL_CALL ResultSetMetaData::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< XTypeProvider* >(this)), @@ -141,7 +140,6 @@ XTYPEPROVIDER_IMPL_2( ResultSetMetaData, // virtual sal_Int32 SAL_CALL ResultSetMetaData::getColumnCount() - throw( SQLException, RuntimeException, std::exception ) { return m_aProps.getLength(); } @@ -149,7 +147,6 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnCount() // virtual sal_Bool SAL_CALL ResultSetMetaData::isAutoIncrement( sal_Int32 /*column*/ ) - throw( SQLException, RuntimeException, std::exception ) { /* Checks whether column is automatically numbered, which makes it @@ -161,7 +158,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isAutoIncrement( sal_Int32 /*column*/ ) // virtual sal_Bool SAL_CALL ResultSetMetaData::isCaseSensitive( sal_Int32 column ) - throw( SQLException, RuntimeException, std::exception ) { if ( ( column < 1 ) || ( column > m_aProps.getLength() ) ) return false; @@ -172,7 +168,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isCaseSensitive( sal_Int32 column ) // virtual sal_Bool SAL_CALL ResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) - throw( SQLException, RuntimeException, std::exception ) { return false; } @@ -180,7 +175,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) // virtual sal_Bool SAL_CALL ResultSetMetaData::isCurrency( sal_Int32 /*column*/ ) - throw( SQLException, RuntimeException, std::exception ) { return false; } @@ -188,7 +182,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isCurrency( sal_Int32 /*column*/ ) // virtual sal_Int32 SAL_CALL ResultSetMetaData::isNullable( sal_Int32 /*column*/ ) - throw( SQLException, RuntimeException, std::exception ) { return ColumnValue::NULLABLE; } @@ -196,7 +189,6 @@ sal_Int32 SAL_CALL ResultSetMetaData::isNullable( sal_Int32 /*column*/ ) // virtual sal_Bool SAL_CALL ResultSetMetaData::isSigned( sal_Int32 /*column*/ ) - throw( SQLException, RuntimeException, std::exception ) { return false; } @@ -204,7 +196,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isSigned( sal_Int32 /*column*/ ) // virtual sal_Int32 SAL_CALL ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) - throw( SQLException, RuntimeException, std::exception ) { /* Gets the normal maximum width in characters for column. @@ -219,7 +210,6 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) // virtual OUString SAL_CALL ResultSetMetaData::getColumnLabel( sal_Int32 column ) - throw( SQLException, RuntimeException, std::exception ) { /* Gets the suggested column title for column, to be used in print- @@ -239,7 +229,6 @@ OUString SAL_CALL ResultSetMetaData::getColumnLabel( sal_Int32 column ) // virtual OUString SAL_CALL ResultSetMetaData::getColumnName( sal_Int32 column ) - throw( SQLException, RuntimeException, std::exception ) { /* Gets the name of column. @@ -254,7 +243,6 @@ OUString SAL_CALL ResultSetMetaData::getColumnName( sal_Int32 column ) // virtual OUString SAL_CALL ResultSetMetaData::getSchemaName( sal_Int32 column ) - throw( SQLException, RuntimeException, std::exception ) { /* Gets the schema name for the table from which column of this @@ -272,7 +260,6 @@ OUString SAL_CALL ResultSetMetaData::getSchemaName( sal_Int32 column ) // virtual sal_Int32 SAL_CALL ResultSetMetaData::getPrecision( sal_Int32 /*column*/ ) - throw( SQLException, RuntimeException, std::exception ) { return -1; } @@ -280,7 +267,6 @@ sal_Int32 SAL_CALL ResultSetMetaData::getPrecision( sal_Int32 /*column*/ ) // virtual sal_Int32 SAL_CALL ResultSetMetaData::getScale( sal_Int32 /*column*/ ) - throw( SQLException, RuntimeException, std::exception ) { return 0; } @@ -288,7 +274,6 @@ sal_Int32 SAL_CALL ResultSetMetaData::getScale( sal_Int32 /*column*/ ) // virtual OUString SAL_CALL ResultSetMetaData::getTableName( sal_Int32 column ) - throw( SQLException, RuntimeException, std::exception ) { /* Gets the name of the table from which column of this result set @@ -306,7 +291,6 @@ OUString SAL_CALL ResultSetMetaData::getTableName( sal_Int32 column ) // virtual OUString SAL_CALL ResultSetMetaData::getCatalogName( sal_Int32 column ) - throw( SQLException, RuntimeException, std::exception ) { /* Gets the catalog name for the table from which column of this @@ -324,7 +308,6 @@ OUString SAL_CALL ResultSetMetaData::getCatalogName( sal_Int32 column ) // virtual sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column ) - throw( SQLException, RuntimeException, std::exception ) { /* Gets the JDBC type for the value stored in column. ... The STRUCT @@ -432,7 +415,6 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column ) // virtual OUString SAL_CALL ResultSetMetaData::getColumnTypeName( sal_Int32 column ) - throw( SQLException, RuntimeException, std::exception ) { /* Gets the type name used by this particular data source for the @@ -450,7 +432,6 @@ OUString SAL_CALL ResultSetMetaData::getColumnTypeName( sal_Int32 column ) // virtual sal_Bool SAL_CALL ResultSetMetaData::isReadOnly( sal_Int32 /*column*/ ) - throw( SQLException, RuntimeException, std::exception ) { return true; } @@ -458,7 +439,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isReadOnly( sal_Int32 /*column*/ ) // virtual sal_Bool SAL_CALL ResultSetMetaData::isWritable( sal_Int32 /*column*/ ) - throw( SQLException, RuntimeException, std::exception ) { return false; } @@ -466,7 +446,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isWritable( sal_Int32 /*column*/ ) // virtual sal_Bool SAL_CALL ResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/ ) - throw( SQLException, RuntimeException, std::exception ) { return false; } @@ -474,7 +453,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/ // virtual OUString SAL_CALL ResultSetMetaData::getColumnServiceName( sal_Int32 column ) - throw( SQLException, RuntimeException, std::exception ) { /* Returns the fully-qualified name of the service whose instances diff --git a/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx index a9712a3425ae..912e559f989b 100644 --- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx +++ b/ucbhelper/source/provider/simplenameclashresolverequest.cxx @@ -45,8 +45,7 @@ public: // XInterface 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() throw() override; virtual void SAL_CALL release() @@ -54,19 +53,15 @@ public: // 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; // XInteractionContinuation - virtual void SAL_CALL select() - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL select() override; // XInteractionSupplyName - virtual void SAL_CALL setName( const OUString& Name ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setName( const OUString& Name ) override; // Non-interface methods. @@ -93,7 +88,6 @@ void SAL_CALL InteractionSupplyName::release() uno::Any SAL_CALL InteractionSupplyName::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, static_cast< lang::XTypeProvider * >( this ), @@ -105,13 +99,11 @@ InteractionSupplyName::queryInterface( const uno::Type & rType ) } uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyName::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } uno::Sequence< uno::Type > SAL_CALL InteractionSupplyName::getTypes() - throw( uno::RuntimeException, std::exception ) { static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) @@ -129,14 +121,12 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyName::getTypes() } void SAL_CALL InteractionSupplyName::select() - throw( uno::RuntimeException, std::exception ) { recordSelection(); } void SAL_CALL InteractionSupplyName::setName( const OUString& Name ) - throw( uno::RuntimeException, std::exception ) { m_aName = Name; } |