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 /filter/source/t602 | |
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 'filter/source/t602')
-rw-r--r-- | filter/source/t602/t602filter.cxx | 25 | ||||
-rw-r--r-- | filter/source/t602/t602filter.hxx | 97 |
2 files changed, 25 insertions, 97 deletions
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 924d475ce826..712e27a918bb 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -154,7 +154,6 @@ T602ImportFilter::~T602ImportFilter() // XExtendedTypeDetection OUString T602ImportFilter::detect( Sequence<PropertyValue>& Descriptor) - throw(RuntimeException, std::exception) { sal_Int32 nLength = Descriptor.getLength(); const PropertyValue * pValue = Descriptor.getConstArray(); @@ -182,21 +181,18 @@ OUString T602ImportFilter::detect( Sequence<PropertyValue>& Descriptor) // XFilter sal_Bool SAL_CALL T602ImportFilter::filter( const Sequence< css::beans::PropertyValue >& aDescriptor ) - throw (RuntimeException, std::exception) { return importImpl ( aDescriptor ); } // XImporter void SAL_CALL T602ImportFilter::setTargetDocument( const Reference< css::lang::XComponent >& xDoc ) - throw (css::lang::IllegalArgumentException, RuntimeException, std::exception) { mxDoc = xDoc; } // XInitialization void SAL_CALL T602ImportFilter::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException, std::exception) { Sequence < PropertyValue > aAnySeq; sal_Int32 nLength = aArguments.getLength(); @@ -250,7 +246,6 @@ void T602ImportFilter::inschr(unsigned char ch) } bool SAL_CALL T602ImportFilter::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor ) - throw (RuntimeException) { Reset602(); @@ -873,31 +868,26 @@ void T602ImportFilter::Read602() // XServiceInfo OUString SAL_CALL T602ImportFilter::getImplementationName( ) - throw (RuntimeException, std::exception) { return T602ImportFilter_getImplementationName(); } sal_Bool SAL_CALL T602ImportFilter::supportsService( const OUString& rServiceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL T602ImportFilter::getSupportedServiceNames( ) - throw (RuntimeException, std::exception) { return T602ImportFilter_getSupportedServiceNames(); } OUString T602ImportFilter_getImplementationName () - throw (RuntimeException) { return OUString ( "com.sun.star.comp.Writer.T602ImportFilter" ); } Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) - throw (RuntimeException) { Sequence < OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -907,7 +897,6 @@ Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) } Reference< XInterface > SAL_CALL T602ImportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) - throw( Exception ) { return static_cast<cppu::OWeakObject*>(new T602ImportFilter( rSMgr )); } @@ -922,14 +911,12 @@ T602ImportFilterDialog::~T602ImportFilterDialog() // XLocalizable void SAL_CALL T602ImportFilterDialog::setLocale( const Locale& eLocale ) - throw(css::uno::RuntimeException, std::exception) { meLocale = eLocale; initLocale(); } Locale SAL_CALL T602ImportFilterDialog::getLocale() - throw(css::uno::RuntimeException, std::exception) { return meLocale; } @@ -1128,12 +1115,10 @@ ResMgr* T602ImportFilterDialog::getResMgr() } void SAL_CALL T602ImportFilterDialog::setTitle( const OUString& ) - throw (css::uno::RuntimeException, std::exception) { } sal_Int16 SAL_CALL T602ImportFilterDialog::execute() - throw (css::uno::RuntimeException, std::exception) { if (OptionsDlg()) return css::ui::dialogs::ExecutableDialogResults::OK; @@ -1147,52 +1132,44 @@ OUString T602ImportFilterDialog::getResStr( sal_Int16 resid ) return sStr; } -uno::Sequence<beans::PropertyValue> SAL_CALL T602ImportFilterDialog::getPropertyValues() throw(uno::RuntimeException, std::exception) +uno::Sequence<beans::PropertyValue> SAL_CALL T602ImportFilterDialog::getPropertyValues() { return uno::Sequence<beans::PropertyValue>(); } void SAL_CALL T602ImportFilterDialog::setPropertyValues( const uno::Sequence<beans::PropertyValue>& ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } // XServiceInfo OUString SAL_CALL T602ImportFilterDialog::getImplementationName( ) - throw (RuntimeException, std::exception) { return T602ImportFilterDialog_getImplementationName(); } sal_Bool SAL_CALL T602ImportFilterDialog::supportsService( const OUString& rServiceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL T602ImportFilterDialog::getSupportedServiceNames( ) - throw (RuntimeException, std::exception) { return T602ImportFilterDialog_getSupportedServiceNames(); } OUString T602ImportFilterDialog_getImplementationName () - throw (RuntimeException) { return OUString ( "com.sun.star.comp.Writer.T602ImportFilterDialog" ); } Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( ) - throw (RuntimeException) { Sequence<OUString> aRet { "com.sun.star.ui.dialogs.FilterOptionsDialog" }; return aRet; } Reference< XInterface > SAL_CALL T602ImportFilterDialog_createInstance( const Reference< XMultiServiceFactory > & ) - throw( Exception ) { return static_cast<cppu::OWeakObject*>(new T602ImportFilterDialog); } diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index 852fb8f33557..74fc56d5eef7 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -53,20 +53,6 @@ typedef enum { enum class tnode {START,READCH,EOL,POCMD,EXPCMD,SETCMD,SETCH,WRITE,EEND,QUIT}; -/// @throws css::uno::RuntimeException -OUString getImplementationName() - throw ( css::uno::RuntimeException ); - -/// @throws css::uno::RuntimeException -css::uno::Sequence < OUString > getSupportedServiceNames() - throw ( css::uno::RuntimeException ); - -/// @throws css::uno::Exception -css::uno::Reference < css::uno::XInterface > SAL_CALL - CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &r) - throw ( css::uno::Exception ); - - // class T602ImportFilter @@ -106,35 +92,23 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper < virtual ~T602ImportFilterDialog() override; // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL execute() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle( const OUString& aTitle ) override; + virtual sal_Int16 SAL_CALL execute() override; // XLocalizable - virtual void SAL_CALL setLocale( const css::lang::Locale& eLocale ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale() - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLocale( const css::lang::Locale& eLocale ) override; + virtual css::lang::Locale SAL_CALL getLocale() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XPropertyAccess virtual css::uno::Sequence< css::beans::PropertyValue > - SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getPropertyValues() override; virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< - css::beans::PropertyValue >& aProps ) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + css::beans::PropertyValue >& aProps ) override; public: explicit T602ImportFilterDialog(); @@ -250,8 +224,7 @@ private: void wrtfnt(); /// @throws css::uno::RuntimeException - bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) - throw (css::uno::RuntimeException); + bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ); public: explicit T602ImportFilter(const css::uno::Reference<css::lang::XMultiServiceFactory > &r ); @@ -259,68 +232,46 @@ private: virtual ~T602ImportFilter() override; // XFilter - virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancel( ) - throw (css::uno::RuntimeException, std::exception) override {}; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override; + virtual void SAL_CALL cancel( ) override {}; // XImporter - virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override; // XExtendedTypeDetection virtual OUString SAL_CALL detect( - css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) - throw( css::uno::RuntimeException, std::exception ) override; + css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; bool SAL_CALL test(); }; /// @throws css::uno::RuntimeException -OUString T602ImportFilter_getImplementationName() - throw ( css::uno::RuntimeException ); - -/// @throws css::uno::RuntimeException -bool SAL_CALL T602ImportFilter_supportsService( const OUString& ServiceName ) - throw ( css::uno::RuntimeException ); +OUString T602ImportFilter_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) - throw ( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL T602ImportFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) - throw ( css::uno::Exception ); - -/// @throws css::uno::RuntimeException -OUString T602ImportFilterDialog_getImplementationName() - throw ( css::uno::RuntimeException ); +SAL_CALL T602ImportFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); /// @throws css::uno::RuntimeException -bool SAL_CALL T602ImportFilterDialog_supportsService( const OUString& ServiceName ) - throw ( css::uno::RuntimeException ); +OUString T602ImportFilterDialog_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( ) - throw ( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL T602ImportFilterDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) - throw ( css::uno::Exception ); +SAL_CALL T602ImportFilterDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); } |