diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:28:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:54:43 +0000 |
commit | e57ca02849c3d87142ff5ff9099a212e72b8139c (patch) | |
tree | bcce66b27261553c308779f3e8663a269ed3a671 /embedserv | |
parent | 8802ebd5172ec4bc412a59d136c82b77ab452281 (diff) |
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html>
"Dynamic Exception Specifications" for details.
Most changes have been done automatically by the rewriting loplugin:dynexcspec
(after enabling the rewriting mode, to be committed shortly). The way it only
removes exception specs from declarations if it also sees a definition, it
identified some dead declarations-w/o-definitions (that have been removed
manually) and some cases where a definition appeared in multiple include files
(which have also been cleaned up manually). There's also been cases of macro
paramters (that were used to abstract over exception specs) that have become
unused now (and been removed).
Furthermore, some code needed to be cleaned up manually
(avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no
configurations available that would actually build that code. Missing @throws
documentation has not been applied in such manual clean-up.
Change-Id: I3408691256c9b0c12bc5332de976743626e13960
Reviewed-on: https://gerrit.libreoffice.org/33574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'embedserv')
-rw-r--r-- | embedserv/source/embed/docholder.cxx | 19 | ||||
-rw-r--r-- | embedserv/source/embed/intercept.cxx | 31 | ||||
-rw-r--r-- | embedserv/source/embed/register.cxx | 3 | ||||
-rw-r--r-- | embedserv/source/embed/servprov.cxx | 3 | ||||
-rw-r--r-- | embedserv/source/inc/docholder.hxx | 39 | ||||
-rw-r--r-- | embedserv/source/inc/intercept.hxx | 59 | ||||
-rw-r--r-- | embedserv/source/inc/servprov.hxx | 9 |
7 files changed, 29 insertions, 134 deletions
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 650fe6675585..783ca2ef765e 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -1200,9 +1200,6 @@ HRESULT DocumentHolder::SetObjectRects(LPCRECT aRect, LPCRECT aClip) css::uno::Reference< css::awt::XWindow> SAL_CALL DocumentHolder::getContainerWindow() - throw ( - css::uno::RuntimeException - ) { if(m_xContainerWindow.is()) return m_xContainerWindow; @@ -1253,9 +1250,6 @@ css::uno::Reference< css::awt::XWindow> SAL_CALL DocumentHolder::getContainerWin sal_Bool SAL_CALL DocumentHolder::requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) - throw( - css::uno::RuntimeException - ) { if(m_bOnDeactivate) return true; @@ -1272,9 +1266,6 @@ sal_Bool SAL_CALL DocumentHolder::requestDockingAreaSpace( const css::awt::Recta void SAL_CALL DocumentHolder::setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) - throw ( - css::uno::RuntimeException - ) { if(m_bOnDeactivate) return; @@ -1307,7 +1298,6 @@ void SAL_CALL DocumentHolder::setDockingAreaSpace( const css::awt::Rectangle& Bo void SAL_CALL DocumentHolder::disposing( const css::lang::EventObject& aSource ) - throw( uno::RuntimeException ) { if ( m_xDocument.is() && m_xDocument == aSource.Source ) { @@ -1325,9 +1315,6 @@ DocumentHolder::queryClosing( const lang::EventObject& aSource, sal_Bool /*bGetsOwnership*/ ) - throw( - util::CloseVetoException - ) { if (!m_bLink && ((m_xDocument.is() && m_xDocument == aSource.Source) @@ -1339,7 +1326,6 @@ DocumentHolder::queryClosing( void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource ) - throw( uno::RuntimeException ) { try { @@ -1369,9 +1355,6 @@ void SAL_CALL DocumentHolder::queryTermination( const lang::EventObject& /*aSource*/ ) - throw( - frame::TerminationVetoException - ) { if ( m_xDocument.is() ) throw frame::TerminationVetoException(); @@ -1381,7 +1364,6 @@ void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSource ) - throw( uno::RuntimeException ) { OSL_ENSURE( !m_xDocument.is(), "Just a disaster..." ); uno::Reference< frame::XDesktop > xDesktop( @@ -1393,7 +1375,6 @@ DocumentHolder::notifyTermination( void SAL_CALL DocumentHolder::modified( const lang::EventObject& /*aEvent*/ ) - throw (uno::RuntimeException) { if ( m_xOleAccess.is() ) { diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx index 3bde41481447..8924d33d8ee0 100644 --- a/embedserv/source/embed/intercept.cxx +++ b/embedserv/source/embed/intercept.cxx @@ -45,7 +45,6 @@ public: void SAL_CALL Interceptor::addEventListener( const uno::Reference<lang::XEventListener >& Listener ) - throw( uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); @@ -60,7 +59,6 @@ Interceptor::addEventListener( void SAL_CALL Interceptor::removeEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); @@ -70,7 +68,6 @@ Interceptor::removeEventListener( void SAL_CALL Interceptor::dispose() - throw(css::uno::RuntimeException) { lang::EventObject aEvt; aEvt.Source = static_cast< frame::XDispatch* >( this ); @@ -140,7 +137,6 @@ Interceptor::dispatch( const util::URL& URL, const uno::Sequence< beans::PropertyValue >& Arguments ) - throw (uno::RuntimeException) { ::rtl::Reference< EmbeddedDocumentInstanceAccess_Impl > xOleAccess; { @@ -265,9 +261,6 @@ Interceptor::addStatusListener( const uno::Reference< frame::XStatusListener >& Control, const util::URL& URL ) - throw ( - uno::RuntimeException - ) { if(!Control.is()) return; @@ -374,9 +367,6 @@ Interceptor::removeStatusListener( const uno::Reference< frame::XStatusListener >& Control, const util::URL& URL ) - throw ( - uno::RuntimeException - ) { if(!(Control.is() && m_pStatCL)) return; @@ -391,9 +381,6 @@ Interceptor::removeStatusListener( uno::Sequence< OUString > SAL_CALL Interceptor::getInterceptedURLs( ) - throw ( - uno::RuntimeException - ) { // now implemented as update if ( m_bLink ) @@ -416,9 +403,6 @@ Interceptor::queryDispatch( const util::URL& URL, const OUString& TargetFrameName, sal_Int32 SearchFlags ) - throw ( - uno::RuntimeException - ) { osl::MutexGuard aGuard(m_aMutex); if( !m_bLink && URL.Complete == m_aInterceptedURL[0] ) @@ -445,9 +429,6 @@ Interceptor::queryDispatch( uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL Interceptor::queryDispatches( const uno::Sequence<frame::DispatchDescriptor >& Requests ) - throw ( - uno::RuntimeException - ) { uno::Sequence< uno::Reference< frame::XDispatch > > aRet; osl::MutexGuard aGuard(m_aMutex); @@ -478,9 +459,6 @@ Interceptor::queryDispatches( uno::Reference< frame::XDispatchProvider > SAL_CALL Interceptor::getSlaveDispatchProvider( ) - throw ( - uno::RuntimeException - ) { osl::MutexGuard aGuard(m_aMutex); return m_xSlaveDispatchProvider; @@ -489,9 +467,6 @@ Interceptor::getSlaveDispatchProvider( ) void SAL_CALL Interceptor::setSlaveDispatchProvider( const uno::Reference< frame::XDispatchProvider >& NewDispatchProvider ) - throw ( - uno::RuntimeException - ) { osl::MutexGuard aGuard(m_aMutex); m_xSlaveDispatchProvider = NewDispatchProvider; @@ -500,9 +475,6 @@ Interceptor::setSlaveDispatchProvider( uno::Reference< frame::XDispatchProvider > SAL_CALL Interceptor::getMasterDispatchProvider( ) - throw ( - uno::RuntimeException - ) { osl::MutexGuard aGuard(m_aMutex); return m_xMasterDispatchProvider; @@ -512,9 +484,6 @@ Interceptor::getMasterDispatchProvider( ) void SAL_CALL Interceptor::setMasterDispatchProvider( const uno::Reference< frame::XDispatchProvider >& NewSupplier ) - throw ( - uno::RuntimeException - ) { osl::MutexGuard aGuard(m_aMutex); m_xMasterDispatchProvider = NewSupplier; diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx index f6d10d564a46..bbe5f6b7f321 100644 --- a/embedserv/source/embed/register.cxx +++ b/embedserv/source/embed/register.cxx @@ -34,10 +34,9 @@ using namespace ::com::sun::star; - +/// @throws uno::Exception uno::Reference<uno::XInterface> SAL_CALL EmbedServer_createInstance( const uno::Reference<lang::XMultiServiceFactory> & xSMgr) -throw (uno::Exception) { uno::Reference<uno::XInterface > xService = *new EmbedServer_Impl( xSMgr ); return xService; diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx index 5afe6d33cf56..ae3d887ac11d 100644 --- a/embedserv/source/embed/servprov.cxx +++ b/embedserv/source/embed/servprov.cxx @@ -120,19 +120,16 @@ EmbedServer_Impl::~EmbedServer_Impl() } OUString EmbedServer_Impl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.ole.EmbedServer"); } sal_Bool EmbedServer_Impl::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> EmbedServer_Impl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{ "com.sun.star.document.OleEmbeddedServerRegistration"}; diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx index e350b434d337..6a9f9b1a8541 100644 --- a/embedserv/source/inc/docholder.hxx +++ b/embedserv/source/inc/docholder.hxx @@ -197,75 +197,54 @@ public: // XEventListener virtual void SAL_CALL - disposing( const css::lang::EventObject& aSource ) - throw( css::uno::RuntimeException ) override; + disposing( const css::lang::EventObject& aSource ) override; // XCloseListener virtual void SAL_CALL queryClosing( const css::lang::EventObject& aSource, sal_Bool bGetsOwnership - ) - throw( - css::util::CloseVetoException - ) override; + ) override; virtual void SAL_CALL notifyClosing( const css::lang::EventObject& aSource - ) - throw( css::uno::RuntimeException ) override; + ) override; // XTerminateListener virtual void SAL_CALL queryTermination( const css::lang::EventObject& aSource - ) - throw( - css::frame::TerminationVetoException - ) override; + ) override; virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aSource - ) - throw( css::uno::RuntimeException ) override; + ) override; // XModifyListener virtual void SAL_CALL modified( const css::lang::EventObject& aEvent - ) - throw ( - css::uno::RuntimeException - ) override; + ) override; // XDockingAreaAcceptor virtual css::uno::Reference< css::awt::XWindow> SAL_CALL getContainerWindow( - ) - throw ( - css::uno::RuntimeException - ) override; + ) override; virtual sal_Bool SAL_CALL requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace - ) - throw( - css::uno::RuntimeException - ) override; + ) override; virtual void SAL_CALL setDockingAreaSpace( const css::awt::Rectangle& BorderSpace - ) - throw ( - css::uno::RuntimeException - ) override; + ) override; }; #endif diff --git a/embedserv/source/inc/intercept.hxx b/embedserv/source/inc/intercept.hxx index 739c9ae6320c..5fffcafa0f59 100644 --- a/embedserv/source/inc/intercept.hxx +++ b/embedserv/source/inc/intercept.hxx @@ -58,48 +58,39 @@ public: // XComponent + /// @throws css::uno::RuntimeException virtual void SAL_CALL addEventListener( - const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw( css::uno::RuntimeException ); + const css::uno::Reference< css::lang::XEventListener >& xListener ); + /// @throws css::uno::RuntimeException virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw( css::uno::RuntimeException ); + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ); + /// @throws css::uno::RuntimeException void SAL_CALL - dispose() throw(css::uno::RuntimeException); + dispose(); //XDispatch virtual void SAL_CALL dispatch( const css::util::URL& URL, - const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException) override; + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& Control, - const css::util::URL& URL ) - throw ( - css::uno::RuntimeException - ) override; + const css::util::URL& URL ) override; virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& Control, - const css::util::URL& URL ) - throw ( - css::uno::RuntimeException - ) override; + const css::util::URL& URL ) override; //XInterceptorInfo virtual css::uno::Sequence< OUString > - SAL_CALL getInterceptedURLs( ) - throw ( - css::uno::RuntimeException - ) override; + SAL_CALL getInterceptedURLs( ) override; //XDispatchProvider ( inherited by XDispatchProviderInterceptor ) @@ -108,46 +99,28 @@ public: queryDispatch( const css::util::URL& URL, const OUString& TargetFrameName, - sal_Int32 SearchFlags ) - throw ( - css::uno::RuntimeException - ) override; + sal_Int32 SearchFlags ) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< - css::frame::DispatchDescriptor >& Requests ) - throw ( - css::uno::RuntimeException - ) override; + css::frame::DispatchDescriptor >& Requests ) override; //XDispatchProviderInterceptor virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL - getSlaveDispatchProvider( ) - throw ( - css::uno::RuntimeException - ) override; + getSlaveDispatchProvider( ) override; virtual void SAL_CALL setSlaveDispatchProvider( - const css::uno::Reference< css::frame::XDispatchProvider >& NewDispatchProvider ) - throw ( - css::uno::RuntimeException - ) override; + const css::uno::Reference< css::frame::XDispatchProvider >& NewDispatchProvider ) override; virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL - getMasterDispatchProvider( ) - throw ( - css::uno::RuntimeException - ) override; + getMasterDispatchProvider( ) override; virtual void SAL_CALL setMasterDispatchProvider( - const css::uno::Reference< css::frame::XDispatchProvider >& NewSupplier ) - throw ( - css::uno::RuntimeException - ) override; + const css::uno::Reference< css::frame::XDispatchProvider >& NewSupplier ) override; private: diff --git a/embedserv/source/inc/servprov.hxx b/embedserv/source/inc/servprov.hxx index ab0c78d843ef..6d1d887da4c0 100644 --- a/embedserv/source/inc/servprov.hxx +++ b/embedserv/source/inc/servprov.hxx @@ -37,14 +37,11 @@ public: EmbedServer_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > &xFactory ); virtual ~EmbedServer_Impl() override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; protected: |