diff options
Diffstat (limited to 'extensions/source/update')
-rw-r--r-- | extensions/source/update/check/updatecheck.cxx | 4 | ||||
-rw-r--r-- | extensions/source/update/check/updatecheckconfig.cxx | 21 | ||||
-rw-r--r-- | extensions/source/update/check/updatecheckconfig.hxx | 43 | ||||
-rw-r--r-- | extensions/source/update/check/updatecheckjob.cxx | 31 | ||||
-rw-r--r-- | extensions/source/update/check/updatehdl.cxx | 12 | ||||
-rw-r--r-- | extensions/source/update/check/updatehdl.hxx | 25 | ||||
-rw-r--r-- | extensions/source/update/feed/updatefeed.cxx | 57 | ||||
-rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 53 |
8 files changed, 80 insertions, 166 deletions
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 79a875b08a85..e3ba2ed972a4 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -294,8 +294,7 @@ public: explicit MenuBarButtonJob(const rtl::Reference< UpdateCheck >& rUpdateCheck); // XJob - virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&) - throw (lang::IllegalArgumentException, uno::Exception, std::exception) override; + virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&) override; private: rtl::Reference< UpdateCheck > m_aUpdateCheck; @@ -565,7 +564,6 @@ MenuBarButtonJob::MenuBarButtonJob(const rtl::Reference< UpdateCheck >& rUpdateC uno::Any SAL_CALL MenuBarButtonJob::execute(const uno::Sequence<beans::NamedValue>& ) - throw (lang::IllegalArgumentException, uno::Exception, std::exception) { if ( m_aUpdateCheck->shouldShowExtUpdDlg() ) m_aUpdateCheck->showExtensionDialog(); diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx index 35f5e60477e6..d98a90507fa1 100644 --- a/extensions/source/update/check/updatecheckconfig.cxx +++ b/extensions/source/update/check/updatecheckconfig.cxx @@ -449,20 +449,19 @@ UpdateCheckConfig::getImplName() } uno::Type SAL_CALL -UpdateCheckConfig::getElementType() throw (uno::RuntimeException, std::exception) +UpdateCheckConfig::getElementType() { return m_xContainer->getElementType(); } sal_Bool SAL_CALL -UpdateCheckConfig::hasElements() throw (uno::RuntimeException, std::exception) +UpdateCheckConfig::hasElements() { return m_xContainer->hasElements(); } uno::Any SAL_CALL UpdateCheckConfig::getByName( const OUString& aName ) - throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aValue = m_xContainer->getByName( aName ); @@ -479,21 +478,19 @@ UpdateCheckConfig::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL -UpdateCheckConfig::getElementNames() throw (uno::RuntimeException, std::exception) +UpdateCheckConfig::getElementNames() { return m_xContainer->getElementNames(); } sal_Bool SAL_CALL -UpdateCheckConfig::hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) +UpdateCheckConfig::hasByName( const OUString& aName ) { return m_xContainer->hasByName( aName ); } void SAL_CALL UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw (lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { return m_xContainer->replaceByName( aName, aElement ); } @@ -502,7 +499,6 @@ UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElemen void SAL_CALL UpdateCheckConfig::commitChanges() - throw (lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Reference< util::XChangesBatch > xChangesBatch(m_xContainer, uno::UNO_QUERY); if( xChangesBatch.is() && xChangesBatch->hasPendingChanges() ) @@ -545,7 +541,7 @@ UpdateCheckConfig::commitChanges() } sal_Bool SAL_CALL -UpdateCheckConfig::hasPendingChanges( ) throw (uno::RuntimeException, std::exception) +UpdateCheckConfig::hasPendingChanges( ) { uno::Reference< util::XChangesBatch > xChangesBatch(m_xContainer, uno::UNO_QUERY); if( xChangesBatch.is() ) @@ -555,7 +551,7 @@ UpdateCheckConfig::hasPendingChanges( ) throw (uno::RuntimeException, std::exce } uno::Sequence< util::ElementChange > SAL_CALL -UpdateCheckConfig::getPendingChanges( ) throw (uno::RuntimeException, std::exception) +UpdateCheckConfig::getPendingChanges( ) { uno::Reference< util::XChangesBatch > xChangesBatch(m_xContainer, uno::UNO_QUERY); if( xChangesBatch.is() ) @@ -660,20 +656,19 @@ bool UpdateCheckConfig::isVersionGreater( const OUString& rVersion1, } OUString SAL_CALL -UpdateCheckConfig::getImplementationName() throw (uno::RuntimeException, std::exception) +UpdateCheckConfig::getImplementationName() { return getImplName(); } sal_Bool SAL_CALL UpdateCheckConfig::supportsService(OUString const & serviceName) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } uno::Sequence< OUString > SAL_CALL -UpdateCheckConfig::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +UpdateCheckConfig::getSupportedServiceNames() { return getServiceNames(); } diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx index c819c90d1814..f130811c1581 100644 --- a/extensions/source/update/check/updatecheckconfig.hxx +++ b/extensions/source/update/check/updatecheckconfig.hxx @@ -150,44 +150,26 @@ public: const OUString& rVersion ); // XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) - throw (css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // XChangesBatch - virtual void SAL_CALL commitChanges( ) - throw (css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasPendingChanges( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::util::ElementChange > SAL_CALL getPendingChanges( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL commitChanges( ) override; + virtual sal_Bool SAL_CALL hasPendingChanges( ) override; + virtual css::uno::Sequence< css::util::ElementChange > SAL_CALL getPendingChanges( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: @@ -203,7 +185,6 @@ private: /// @throws css::uno::RuntimeException template <typename T> T getValue( const css::uno::Sequence< css::beans::NamedValue >& rNamedValues, const sal_Char * pszName ) - throw (css::uno::RuntimeException) { for( sal_Int32 n=0; n < rNamedValues.getLength(); n++ ) { diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index e891f3189664..b10755903db6 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -79,26 +79,19 @@ public: static OUString getImplName(); // XJob - virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&) - throw (lang::IllegalArgumentException, uno::Exception, std::exception) override; + virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) - throw (uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XEventListener - virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) override; // XTerminateListener - virtual void SAL_CALL queryTermination( lang::EventObject const & evt ) - throw ( frame::TerminationVetoException, uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL notifyTermination( lang::EventObject const & evt ) - throw ( uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL queryTermination( lang::EventObject const & evt ) override; + virtual void SAL_CALL notifyTermination( lang::EventObject const & evt ) override; private: uno::Reference<uno::XComponentContext> m_xContext; @@ -171,7 +164,6 @@ UpdateCheckJob::getImplName() uno::Any UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues) - throw (lang::IllegalArgumentException, uno::Exception, std::exception) { for ( sal_Int32 n=namedValues.getLength(); n-- > 0; ) { @@ -251,20 +243,20 @@ void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedVa OUString SAL_CALL -UpdateCheckJob::getImplementationName() throw (uno::RuntimeException, std::exception) +UpdateCheckJob::getImplementationName() { return getImplName(); } uno::Sequence< OUString > SAL_CALL -UpdateCheckJob::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +UpdateCheckJob::getSupportedServiceNames() { return getServiceNames(); } sal_Bool SAL_CALL -UpdateCheckJob::supportsService( OUString const & serviceName ) throw (uno::RuntimeException, std::exception) +UpdateCheckJob::supportsService( OUString const & serviceName ) { return cppu::supportsService(this, serviceName); } @@ -272,7 +264,6 @@ UpdateCheckJob::supportsService( OUString const & serviceName ) throw (uno::Runt // XEventListener void SAL_CALL UpdateCheckJob::disposing( lang::EventObject const & rEvt ) - throw ( uno::RuntimeException, std::exception ) { bool shutDown = ( rEvt.Source == m_xDesktop ); @@ -287,7 +278,6 @@ void SAL_CALL UpdateCheckJob::disposing( lang::EventObject const & rEvt ) // XTerminateListener void SAL_CALL UpdateCheckJob::queryTermination( lang::EventObject const & ) - throw ( frame::TerminationVetoException, uno::RuntimeException, std::exception ) { } @@ -302,7 +292,6 @@ void UpdateCheckJob::terminateAndJoinThread() } void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & ) - throw ( uno::RuntimeException, std::exception ) { terminateAndJoinThread(); } diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 40939ec6042c..091b3516d781 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -300,7 +300,6 @@ OUString UpdateHandler::getDefaultInstErrMsg() // XActionListener void SAL_CALL UpdateHandler::disposing( const lang::EventObject& rEvt ) - throw( uno::RuntimeException, std::exception ) { if ( rEvt.Source == mxUpdDlg ) mxUpdDlg.clear(); @@ -308,7 +307,6 @@ void SAL_CALL UpdateHandler::disposing( const lang::EventObject& rEvt ) void SAL_CALL UpdateHandler::actionPerformed( awt::ActionEvent const & rEvent ) - throw( uno::RuntimeException, std::exception ) { DialogControls eButton = BUTTON_COUNT; for ( int i = 0; i < BUTTON_COUNT; i++ ) @@ -373,13 +371,11 @@ void SAL_CALL UpdateHandler::actionPerformed( awt::ActionEvent const & rEvent ) // XTopWindowListener void SAL_CALL UpdateHandler::windowOpened( const lang::EventObject& ) - throw( uno::RuntimeException, std::exception ) { } void SAL_CALL UpdateHandler::windowClosing( const lang::EventObject& e ) - throw( uno::RuntimeException, std::exception ) { awt::ActionEvent aActionEvt; aActionEvt.ActionCommand = COMMAND_CLOSE; @@ -390,40 +386,34 @@ void SAL_CALL UpdateHandler::windowClosing( const lang::EventObject& e ) void SAL_CALL UpdateHandler::windowClosed( const lang::EventObject& ) - throw( uno::RuntimeException, std::exception ) { } void SAL_CALL UpdateHandler::windowMinimized( const lang::EventObject& ) - throw( uno::RuntimeException, std::exception ) { mbMinimized = true; } void SAL_CALL UpdateHandler::windowNormalized( const lang::EventObject& ) - throw( uno::RuntimeException, std::exception ) { mbMinimized = false; } void SAL_CALL UpdateHandler::windowActivated( const lang::EventObject& ) - throw( uno::RuntimeException, std::exception ) { } void SAL_CALL UpdateHandler::windowDeactivated( const lang::EventObject& ) - throw( uno::RuntimeException, std::exception ) { } // XInteractionHandler void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest > const & rRequest) - throw (uno::RuntimeException, std::exception) { if ( !mxInteractionHdl.is() ) { @@ -467,7 +457,6 @@ void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest > // XTerminateListener void SAL_CALL UpdateHandler::queryTermination( const lang::EventObject& ) - throw ( frame::TerminationVetoException, uno::RuntimeException, std::exception ) { if ( mbShowsMessageBox ) { @@ -485,7 +474,6 @@ void SAL_CALL UpdateHandler::queryTermination( const lang::EventObject& ) void SAL_CALL UpdateHandler::notifyTermination( const lang::EventObject& ) - throw ( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( maMutex ); diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx index da93b1f9dc44..d8d500fc047e 100644 --- a/extensions/source/update/check/updatehdl.hxx +++ b/extensions/source/update/check/updatehdl.hxx @@ -183,25 +183,24 @@ public: { return const_cast< cppu::OWeakObject * > (static_cast< cppu::OWeakObject const * > (this)); }; // XActionListener - virtual void SAL_CALL disposing( const css::lang::EventObject &rObj ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL actionPerformed( css::awt::ActionEvent const & rEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject &rObj ) override; + virtual void SAL_CALL actionPerformed( css::awt::ActionEvent const & rEvent) override; // XTopWindowListener - virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) override; + virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) override; + virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) override; + virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) override; + virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) override; + virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) override; + virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) override; // XInteractionHandler - virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& e ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& e ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& e ) override; }; #endif // INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEHDL_HXX diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 38c434608312..9323b095b191 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -117,10 +117,8 @@ class ActiveDataSink : public ::cppu::WeakImplHelper< io::XActiveDataSink > public: ActiveDataSink() {}; - virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream() - throw (uno::RuntimeException, std::exception) override { return m_xStream; }; - virtual void SAL_CALL setInputStream( uno::Reference< io::XInputStream > const & rStream ) - throw (uno::RuntimeException, std::exception) override { m_xStream = rStream; }; + virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream() override { return m_xStream; }; + virtual void SAL_CALL setInputStream( uno::Reference< io::XInputStream > const & rStream ) override { m_xStream = rStream; }; }; @@ -146,40 +144,32 @@ public: getUpdateInformation( uno::Sequence< OUString > const & repositories, OUString const & extensionId - ) throw (uno::Exception, uno::RuntimeException, std::exception) override; + ) override; - virtual void SAL_CALL cancel() - throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() override; virtual void SAL_CALL setInteractionHandler( - uno::Reference< task::XInteractionHandler > const & handler ) - throw (uno::RuntimeException, std::exception) override; + uno::Reference< task::XInteractionHandler > const & handler ) override; virtual uno::Reference< container::XEnumeration > SAL_CALL getUpdateInformationEnumeration( uno::Sequence< OUString > const & repositories, OUString const & extensionId - ) throw (uno::Exception, uno::RuntimeException, std::exception) override; + ) override; // XCommandEnvironment - virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() - throw ( uno::RuntimeException, std::exception ) override; + virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() override; - virtual uno::Reference< ucb::XProgressHandler > SAL_CALL getProgressHandler() - throw ( uno::RuntimeException, std::exception ) override { return uno::Reference< ucb::XProgressHandler >(); }; + virtual uno::Reference< ucb::XProgressHandler > SAL_CALL getProgressHandler() override { return uno::Reference< ucb::XProgressHandler >(); }; // XWebDAVCommandEnvironment virtual uno::Sequence< beans::StringPair > SAL_CALL getUserRequestHeaders( - const OUString&, ucb::WebDAVHTTPMethod ) - throw ( uno::RuntimeException, std::exception ) override; + const OUString&, ucb::WebDAVHTTPMethod ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) - throw (uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: @@ -230,8 +220,8 @@ public: }; // XEnumeration - sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException, std::exception) override { return m_nCount < m_nNodes; }; - uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL hasMoreElements() override { return m_nCount < m_nNodes; }; + uno::Any SAL_CALL nextElement() override { OSL_ASSERT( m_xNodeList.is() ); OSL_ASSERT( m_xUpdateInformationProvider.is() ); @@ -288,8 +278,8 @@ public: : m_nCount(0) { m_aEntry.UpdateDocument = xElement; }; // XEnumeration - sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException, std::exception) override { return 0 == m_nCount; }; - uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL hasMoreElements() override { return 0 == m_nCount; }; + uno::Any SAL_CALL nextElement() override { if( m_nCount > 0 ) throw container::NoSuchElementException(OUString::number(m_nCount), *this); @@ -385,7 +375,6 @@ OUString UpdateInformationProvider::getUserAgent(bool bExtended) uno::Sequence< beans::StringPair > SAL_CALL UpdateInformationProvider::getUserRequestHeaders( const OUString &aURL, ucb::WebDAVHTTPMethod ) - throw ( uno::RuntimeException, std::exception ) { bool bExtendedUserAgent; uno::Sequence< beans::StringPair > aPair = m_aRequestHeaderList; @@ -585,7 +574,7 @@ uno::Reference< container::XEnumeration > SAL_CALL UpdateInformationProvider::getUpdateInformationEnumeration( uno::Sequence< OUString > const & repositories, OUString const & extensionId -) throw (uno::Exception, uno::RuntimeException, std::exception) +) { OSL_ASSERT(m_xDocumentBuilder.is()); @@ -655,7 +644,7 @@ uno::Sequence< uno::Reference< xml::dom::XElement > > SAL_CALL UpdateInformationProvider::getUpdateInformation( uno::Sequence< OUString > const & repositories, OUString const & extensionId -) throw (uno::Exception, uno::RuntimeException, std::exception) +) { uno::Reference< container::XEnumeration > xEnumeration( getUpdateInformationEnumeration(repositories, extensionId) @@ -694,7 +683,7 @@ UpdateInformationProvider::getUpdateInformation( void SAL_CALL -UpdateInformationProvider::cancel() throw (uno::RuntimeException, std::exception) +UpdateInformationProvider::cancel() { m_bCancelled.set(); @@ -707,7 +696,6 @@ UpdateInformationProvider::cancel() throw (uno::RuntimeException, std::exception void SAL_CALL UpdateInformationProvider::setInteractionHandler( uno::Reference< task::XInteractionHandler > const & handler ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); m_xInteractionHandler = handler; @@ -716,7 +704,6 @@ UpdateInformationProvider::setInteractionHandler( uno::Reference< task::XInteractionHandler > SAL_CALL UpdateInformationProvider::getInteractionHandler() - throw ( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -762,20 +749,20 @@ UpdateInformationProvider::getImplName() OUString SAL_CALL -UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException, std::exception) +UpdateInformationProvider::getImplementationName() { return getImplName(); } uno::Sequence< OUString > SAL_CALL -UpdateInformationProvider::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +UpdateInformationProvider::getSupportedServiceNames() { return getServiceNames(); } sal_Bool SAL_CALL -UpdateInformationProvider::supportsService( OUString const & serviceName ) throw (uno::RuntimeException, std::exception) +UpdateInformationProvider::supportsService( OUString const & serviceName ) { return cppu::supportsService(this, serviceName); } diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 16bba2d55dbb..8fc5989dbf9b 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -157,39 +157,26 @@ public: virtual ~UpdateCheckUI() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) - throw (uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XDocumentEventListener - virtual void SAL_CALL documentEventOccured(const document::DocumentEvent& Event) - throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing(const lang::EventObject& Event) - throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL documentEventOccured(const document::DocumentEvent& Event) override; + virtual void SAL_CALL disposing(const lang::EventObject& Event) override; //XPropertySet - virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw ( uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const uno::Any& aValue) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override; - virtual uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override; + virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; + virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const uno::Any& aValue) override; + virtual uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) override; virtual void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, - const uno::Reference< beans::XPropertyChangeListener > & aListener) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override; + const uno::Reference< beans::XPropertyChangeListener > & aListener) override; virtual void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, - const uno::Reference< beans::XPropertyChangeListener > & aListener) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override; + const uno::Reference< beans::XPropertyChangeListener > & aListener) override; virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, - const uno::Reference< beans::XVetoableChangeListener > & aListener) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override; + const uno::Reference< beans::XVetoableChangeListener > & aListener) override; virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, - const uno::Reference< beans::XVetoableChangeListener > & aListener) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override; + const uno::Reference< beans::XVetoableChangeListener > & aListener) override; }; @@ -231,19 +218,19 @@ UpdateCheckUI::~UpdateCheckUI() OUString SAL_CALL -UpdateCheckUI::getImplementationName() throw (uno::RuntimeException, std::exception) +UpdateCheckUI::getImplementationName() { return ::getImplementationName(); } uno::Sequence< OUString > SAL_CALL -UpdateCheckUI::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +UpdateCheckUI::getSupportedServiceNames() { return ::getServiceNames(); } sal_Bool SAL_CALL -UpdateCheckUI::supportsService( OUString const & serviceName ) throw (uno::RuntimeException, std::exception) +UpdateCheckUI::supportsService( OUString const & serviceName ) { return cppu::supportsService(this, serviceName); } @@ -357,7 +344,6 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl ) void SAL_CALL UpdateCheckUI::documentEventOccured(const document::DocumentEvent& rEvent) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -369,13 +355,11 @@ void SAL_CALL UpdateCheckUI::documentEventOccured(const document::DocumentEvent& void SAL_CALL UpdateCheckUI::disposing(const lang::EventObject&) - throw (uno::RuntimeException, std::exception) { } uno::Reference< beans::XPropertySetInfo > UpdateCheckUI::getPropertySetInfo() - throw ( uno::RuntimeException, std::exception ) { return nullptr; } @@ -383,8 +367,6 @@ uno::Reference< beans::XPropertySetInfo > UpdateCheckUI::getPropertySetInfo() void UpdateCheckUI::setPropertyValue(const OUString& rPropertyName, const uno::Any& rValue) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -448,7 +430,6 @@ void UpdateCheckUI::setPropertyValue(const OUString& rPropertyName, uno::Any UpdateCheckUI::getPropertyValue(const OUString& rPropertyName) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -475,7 +456,6 @@ uno::Any UpdateCheckUI::getPropertyValue(const OUString& rPropertyName) void UpdateCheckUI::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { //no bound properties } @@ -483,7 +463,6 @@ void UpdateCheckUI::addPropertyChangeListener( const OUString& /*aPropertyName*/ void UpdateCheckUI::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { //no bound properties } @@ -491,7 +470,6 @@ void UpdateCheckUI::removePropertyChangeListener( const OUString& /*aPropertyNam void UpdateCheckUI::addVetoableChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { //no vetoable properties } @@ -499,7 +477,6 @@ void UpdateCheckUI::addVetoableChangeListener( const OUString& /*aPropertyName*/ void UpdateCheckUI::removeVetoableChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { //no vetoable properties } |