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 /stoc/source/corereflection | |
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 'stoc/source/corereflection')
-rw-r--r-- | stoc/source/corereflection/base.hxx | 118 | ||||
-rw-r--r-- | stoc/source/corereflection/crarray.cxx | 10 | ||||
-rw-r--r-- | stoc/source/corereflection/crbase.cxx | 19 | ||||
-rw-r--r-- | stoc/source/corereflection/crcomp.cxx | 34 | ||||
-rw-r--r-- | stoc/source/corereflection/crefl.cxx | 17 | ||||
-rw-r--r-- | stoc/source/corereflection/crenum.cxx | 33 | ||||
-rw-r--r-- | stoc/source/corereflection/criface.cxx | 73 |
7 files changed, 101 insertions, 203 deletions
diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx index 5f4676e192fb..6638493ad3fa 100644 --- a/stoc/source/corereflection/base.hxx +++ b/stoc/source/corereflection/base.hxx @@ -99,45 +99,45 @@ class IdlReflectionServiceImpl public: /// @throws css::uno::RuntimeException - const css::uno::Mapping & getCpp2Uno() throw(css::uno::RuntimeException); + const css::uno::Mapping & getCpp2Uno(); /// @throws css::uno::RuntimeException - const css::uno::Mapping & getUno2Cpp() throw(css::uno::RuntimeException); + const css::uno::Mapping & getUno2Cpp(); /// @throws css::uno::RuntimeException - uno_Interface * mapToUno( const css::uno::Any & rObj, typelib_InterfaceTypeDescription * pTo ) throw(css::uno::RuntimeException); + uno_Interface * mapToUno( const css::uno::Any & rObj, typelib_InterfaceTypeDescription * pTo ); // ctor/ dtor explicit IdlReflectionServiceImpl( const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~IdlReflectionServiceImpl() override; // 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; // some XComponent part from OComponentHelper - virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) 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 & rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XTypeProvider - 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() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XIdlReflection - virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL forName( const OUString & rTypeName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getType( const css::uno::Any & rObj ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL forName( const OUString & rTypeName ) override; + virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getType( const css::uno::Any & rObj ) override; // XHierarchicalNameAccess - virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString & rName ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString & rName ) override; + virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString & rName ) override; /// @throws css::uno::RuntimeException - css::uno::Reference< css::reflection::XIdlClass > forType( typelib_TypeDescription * pTypeDescr ) throw(css::uno::RuntimeException); + css::uno::Reference< css::reflection::XIdlClass > forType( typelib_TypeDescription * pTypeDescr ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::reflection::XIdlClass > forType( typelib_TypeDescriptionReference * pRef ) throw(css::uno::RuntimeException); + css::uno::Reference< css::reflection::XIdlClass > forType( typelib_TypeDescriptionReference * pRef ); }; @@ -165,30 +165,30 @@ public: virtual ~IdlClassImpl() override; // XIdlClassImpl default implementation - virtual css::uno::TypeClass SAL_CALL getTypeClass() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL equals( const css::uno::Reference< css::reflection::XIdlClass >& xType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::TypeClass SAL_CALL getTypeClass() override; + virtual OUString SAL_CALL getName() override; + virtual sal_Bool SAL_CALL equals( const css::uno::Reference< css::reflection::XIdlClass >& xType ) override; - virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL createObject( css::uno::Any & rObj ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) override; + virtual void SAL_CALL createObject( css::uno::Any & rObj ) override; // def impl ???? - virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getClasses() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getClass( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getInterfaces() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getClasses() override; + virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getClass( const OUString & rName ) override; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getInterfaces() override; // structs, interfaces - virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() override; // structs - virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) override; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() override; // interfaces - virtual css::uno::Uik SAL_CALL getUik() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::reflection::XIdlMethod > SAL_CALL getMethod( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlMethod > > SAL_CALL getMethods() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Uik SAL_CALL getUik() override; + virtual css::uno::Reference< css::reflection::XIdlMethod > SAL_CALL getMethod( const OUString & rName ) override; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlMethod > > SAL_CALL getMethods() override; // array - virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getComponentType() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::reflection::XIdlArray > SAL_CALL getArray() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getComponentType() override; + virtual css::uno::Reference< css::reflection::XIdlArray > SAL_CALL getArray() override; }; @@ -223,14 +223,14 @@ public: virtual ~InterfaceIdlClassImpl() override; // IdlClassImpl modifications - virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Uik SAL_CALL getUik() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::reflection::XIdlMethod > SAL_CALL getMethod( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlMethod > > SAL_CALL getMethods() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL createObject( css::uno::Any & rObj ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) override; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() override; + virtual css::uno::Uik SAL_CALL getUik() override; + virtual css::uno::Reference< css::reflection::XIdlMethod > SAL_CALL getMethod( const OUString & rName ) override; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlMethod > > SAL_CALL getMethods() override; + virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) override; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() override; + virtual void SAL_CALL createObject( css::uno::Any & rObj ) override; }; @@ -257,10 +257,10 @@ public: virtual ~CompoundIdlClassImpl() override; // IdlClassImpl modifications - virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) override; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() override; + virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) override; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() override; }; @@ -279,24 +279,24 @@ public: : IdlClassImpl( pReflection, rName, eTypeClass, pTypeDescr ) {} - 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< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; - 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() override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // IdlClassImpl modifications - virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getComponentType() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::reflection::XIdlArray > SAL_CALL getArray() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) override; + virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getComponentType() override; + virtual css::uno::Reference< css::reflection::XIdlArray > SAL_CALL getArray() override; // XIdlArray - virtual void SAL_CALL realloc( css::uno::Any & rArray, sal_Int32 nLen ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getLen( const css::uno::Any & rArray ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL get( const css::uno::Any & rArray, sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::lang::ArrayIndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL set( css::uno::Any & rArray, sal_Int32 nIndex, const css::uno::Any & rNewValue ) throw(css::lang::IllegalArgumentException, css::lang::ArrayIndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL realloc( css::uno::Any & rArray, sal_Int32 nLen ) override; + virtual sal_Int32 SAL_CALL getLen( const css::uno::Any & rArray ) override; + virtual css::uno::Any SAL_CALL get( const css::uno::Any & rArray, sal_Int32 nIndex ) override; + virtual void SAL_CALL set( css::uno::Any & rArray, sal_Int32 nIndex, const css::uno::Any & rNewValue ) override; }; @@ -320,9 +320,9 @@ public: virtual ~EnumIdlClassImpl() override; // IdlClassImpl modifications - virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL createObject( css::uno::Any & rObj ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) override; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() override; + virtual void SAL_CALL createObject( css::uno::Any & rObj ) override; }; @@ -353,8 +353,8 @@ public: virtual ~IdlMemberImpl() override; // XIdlMember - virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getDeclaringClass() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getDeclaringClass() override; + virtual OUString SAL_CALL getName() override; }; diff --git a/stoc/source/corereflection/crarray.cxx b/stoc/source/corereflection/crarray.cxx index 1241430aebcc..3ab0b557a28a 100644 --- a/stoc/source/corereflection/crarray.cxx +++ b/stoc/source/corereflection/crarray.cxx @@ -33,7 +33,6 @@ namespace stoc_corefl // XInterface Any ArrayIdlClassImpl::queryInterface( const Type & rType ) - throw(css::uno::RuntimeException, std::exception) { Any aRet( ::cppu::queryInterface( rType, static_cast< XIdlArray * >( this ) ) ); return (aRet.hasValue() ? aRet : IdlClassImpl::queryInterface( rType )); @@ -52,7 +51,6 @@ void ArrayIdlClassImpl::release() throw() // XTypeProvider Sequence< Type > ArrayIdlClassImpl::getTypes() - throw (css::uno::RuntimeException, std::exception) { static ::cppu::OTypeCollection * s_pTypes = nullptr; if (! s_pTypes) @@ -70,7 +68,6 @@ Sequence< Type > ArrayIdlClassImpl::getTypes() } Sequence< sal_Int8 > ArrayIdlClassImpl::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -78,7 +75,6 @@ Sequence< sal_Int8 > ArrayIdlClassImpl::getImplementationId() // XIdlArray void ArrayIdlClassImpl::realloc( Any & rArray, sal_Int32 nLen ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { TypeClass eTC = rArray.getValueTypeClass(); if (eTC != TypeClass_SEQUENCE) @@ -103,7 +99,6 @@ void ArrayIdlClassImpl::realloc( Any & rArray, sal_Int32 nLen ) } sal_Int32 ArrayIdlClassImpl::getLen( const Any & rArray ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { TypeClass eTC = rArray.getValueTypeClass(); if (eTC != TypeClass_SEQUENCE) @@ -117,7 +112,6 @@ sal_Int32 ArrayIdlClassImpl::getLen( const Any & rArray ) } Any ArrayIdlClassImpl::get( const Any & rArray, sal_Int32 nIndex ) - throw(css::lang::IllegalArgumentException, css::lang::ArrayIndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { TypeClass eTC = rArray.getValueTypeClass(); if (eTC != TypeClass_SEQUENCE) @@ -148,7 +142,6 @@ Any ArrayIdlClassImpl::get( const Any & rArray, sal_Int32 nIndex ) void ArrayIdlClassImpl::set( Any & rArray, sal_Int32 nIndex, const Any & rNewValue ) - throw(css::lang::IllegalArgumentException, css::lang::ArrayIndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { TypeClass eTC = rArray.getValueTypeClass(); if (eTC != TypeClass_SEQUENCE) @@ -191,7 +184,6 @@ void ArrayIdlClassImpl::set( Any & rArray, sal_Int32 nIndex, const Any & rNewVal // ArrayIdlClassImpl sal_Bool ArrayIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType ) - throw(css::uno::RuntimeException, std::exception) { return (xType.is() && (equals( xType ) || @@ -200,13 +192,11 @@ sal_Bool ArrayIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xTy } Reference< XIdlClass > ArrayIdlClassImpl::getComponentType() - throw(css::uno::RuntimeException, std::exception) { return getReflection()->forType( getTypeDescr()->pType ); } Reference< XIdlArray > ArrayIdlClassImpl::getArray() - throw(css::uno::RuntimeException, std::exception) { return this; } diff --git a/stoc/source/corereflection/crbase.cxx b/stoc/source/corereflection/crbase.cxx index a1deec9b9368..3352e85ebc3d 100644 --- a/stoc/source/corereflection/crbase.cxx +++ b/stoc/source/corereflection/crbase.cxx @@ -87,19 +87,16 @@ IdlClassImpl::~IdlClassImpl() // XIdlClassImpl default implementation TypeClass IdlClassImpl::getTypeClass() - throw(css::uno::RuntimeException, std::exception) { return _eTypeClass; } OUString IdlClassImpl::getName() - throw(css::uno::RuntimeException, std::exception) { return _aName; } sal_Bool IdlClassImpl::equals( const Reference< XIdlClass >& xType ) - throw(css::uno::RuntimeException, std::exception) { return (xType.is() && (xType->getTypeClass() == _eTypeClass) && (xType->getName() == _aName)); @@ -122,7 +119,6 @@ static const bool s_aAssignableFromTab[11][11] = }; sal_Bool IdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType ) - throw(css::uno::RuntimeException, std::exception) { TypeClass eAssign = getTypeClass(); if (equals( xType ) || eAssign == TypeClass_ANY) // default shot @@ -142,7 +138,6 @@ sal_Bool IdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType ) } void IdlClassImpl::createObject( Any & rObj ) - throw(css::uno::RuntimeException, std::exception) { rObj.clear(); uno_any_destruct( &rObj, reinterpret_cast< uno_ReleaseFunc >(cpp_release) ); @@ -152,21 +147,18 @@ void IdlClassImpl::createObject( Any & rObj ) // what TODO ???? Sequence< Reference< XIdlClass > > IdlClassImpl::getClasses() - throw(css::uno::RuntimeException, std::exception) { OSL_FAIL( "### unexpected use!" ); return Sequence< Reference< XIdlClass > >(); } Reference< XIdlClass > IdlClassImpl::getClass( const OUString & ) - throw(css::uno::RuntimeException, std::exception) { OSL_FAIL( "### unexpected use!" ); return Reference< XIdlClass >(); } Sequence< Reference< XIdlClass > > IdlClassImpl::getInterfaces() - throw(css::uno::RuntimeException, std::exception) { // OSL_FAIL( "### unexpected use!" ); return Sequence< Reference< XIdlClass > >(); @@ -174,52 +166,45 @@ Sequence< Reference< XIdlClass > > IdlClassImpl::getInterfaces() // structs, interfaces -Sequence< Reference< XIdlClass > > IdlClassImpl::getSuperclasses() throw(css::uno::RuntimeException, std::exception) +Sequence< Reference< XIdlClass > > IdlClassImpl::getSuperclasses() { return Sequence< Reference< XIdlClass > >(); } // structs Reference< XIdlField > IdlClassImpl::getField( const OUString & ) - throw(css::uno::RuntimeException, std::exception) { return Reference< XIdlField >(); } Sequence< Reference< XIdlField > > IdlClassImpl::getFields() - throw(css::uno::RuntimeException, std::exception) { return Sequence< Reference< XIdlField > >(); } // interfaces Uik IdlClassImpl::getUik() - throw(css::uno::RuntimeException, std::exception) { return Uik(); } Reference< XIdlMethod > IdlClassImpl::getMethod( const OUString & ) - throw(css::uno::RuntimeException, std::exception) { return Reference< XIdlMethod >(); } Sequence< Reference< XIdlMethod > > IdlClassImpl::getMethods() - throw(css::uno::RuntimeException, std::exception) { return Sequence< Reference< XIdlMethod > >(); } // array Reference< XIdlClass > IdlClassImpl::getComponentType() - throw(css::uno::RuntimeException, std::exception) { return Reference< XIdlClass >(); } Reference< XIdlArray > IdlClassImpl::getArray() - throw(css::uno::RuntimeException, std::exception) { return Reference< XIdlArray >(); } @@ -250,7 +235,6 @@ IdlMemberImpl::~IdlMemberImpl() // XIdlMember Reference< XIdlClass > IdlMemberImpl::getDeclaringClass() - throw(css::uno::RuntimeException, std::exception) { if (! _xDeclClass.is()) { @@ -263,7 +247,6 @@ Reference< XIdlClass > IdlMemberImpl::getDeclaringClass() } OUString IdlMemberImpl::getName() - throw(css::uno::RuntimeException, std::exception) { return _aName; } diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx index 3596e220a3c4..3dd101f2979f 100644 --- a/stoc/source/corereflection/crcomp.cxx +++ b/stoc/source/corereflection/crcomp.cxx @@ -50,30 +50,29 @@ public: {} // XInterface - virtual Any SAL_CALL queryInterface( const Type & rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual Any SAL_CALL queryInterface( const Type & rType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XTypeProvider - virtual Sequence< Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override; + virtual Sequence< Type > SAL_CALL getTypes() override; + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XIdlMember - virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; + virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() override; + virtual OUString SAL_CALL getName() override; // XIdlField - virtual Reference< XIdlClass > SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override; - virtual FieldAccessMode SAL_CALL getAccessMode() throw(css::uno::RuntimeException, std::exception) override; - virtual Any SAL_CALL get( const Any & rObj ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL set( const Any & rObj, const Any & rValue ) throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; + virtual Reference< XIdlClass > SAL_CALL getType() override; + virtual FieldAccessMode SAL_CALL getAccessMode() override; + virtual Any SAL_CALL get( const Any & rObj ) override; + virtual void SAL_CALL set( const Any & rObj, const Any & rValue ) override; // XIdlField2: getType, getAccessMode and get are equal to XIdlField - virtual void SAL_CALL set( Any & rObj, const Any & rValue ) throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL set( Any & rObj, const Any & rValue ) override; }; // XInterface Any IdlCompFieldImpl::queryInterface( const Type & rType ) - throw(css::uno::RuntimeException, std::exception) { Any aRet( ::cppu::queryInterface( rType, static_cast< XIdlField * >( this ), @@ -94,7 +93,6 @@ void IdlCompFieldImpl::release() throw() // XTypeProvider Sequence< Type > IdlCompFieldImpl::getTypes() - throw (css::uno::RuntimeException, std::exception) { static ::cppu::OTypeCollection * s_pTypes = nullptr; if (! s_pTypes) @@ -113,7 +111,6 @@ Sequence< Type > IdlCompFieldImpl::getTypes() } Sequence< sal_Int8 > IdlCompFieldImpl::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -121,7 +118,6 @@ Sequence< sal_Int8 > IdlCompFieldImpl::getImplementationId() // XIdlMember Reference< XIdlClass > IdlCompFieldImpl::getDeclaringClass() - throw(css::uno::RuntimeException, std::exception) { if (! _xDeclClass.is()) { @@ -149,7 +145,6 @@ Reference< XIdlClass > IdlCompFieldImpl::getDeclaringClass() } OUString IdlCompFieldImpl::getName() - throw(css::uno::RuntimeException, std::exception) { return IdlMemberImpl::getName(); } @@ -157,19 +152,16 @@ OUString IdlCompFieldImpl::getName() // XIdlField Reference< XIdlClass > IdlCompFieldImpl::getType() - throw(css::uno::RuntimeException, std::exception) { return getReflection()->forType( getTypeDescr() ); } FieldAccessMode IdlCompFieldImpl::getAccessMode() - throw(css::uno::RuntimeException, std::exception) { return FieldAccessMode_READWRITE; } Any IdlCompFieldImpl::get( const Any & rObj ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { if (rObj.getValueTypeClass() == css::uno::TypeClass_STRUCT || rObj.getValueTypeClass() == css::uno::TypeClass_EXCEPTION) @@ -202,7 +194,6 @@ Any IdlCompFieldImpl::get( const Any & rObj ) } void IdlCompFieldImpl::set( const Any & rObj, const Any & rValue ) - throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) { if (rObj.getValueTypeClass() == css::uno::TypeClass_STRUCT || rObj.getValueTypeClass() == css::uno::TypeClass_EXCEPTION) @@ -239,7 +230,6 @@ void IdlCompFieldImpl::set( const Any & rObj, const Any & rValue ) void IdlCompFieldImpl::set( Any & rObj, const Any & rValue ) - throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) { if (rObj.getValueTypeClass() == css::uno::TypeClass_STRUCT || rObj.getValueTypeClass() == css::uno::TypeClass_EXCEPTION) @@ -281,7 +271,6 @@ CompoundIdlClassImpl::~CompoundIdlClassImpl() sal_Bool CompoundIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType ) - throw(css::uno::RuntimeException, std::exception) { if (xType.is()) { @@ -305,7 +294,6 @@ sal_Bool CompoundIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & } Sequence< Reference< XIdlClass > > CompoundIdlClassImpl::getSuperclasses() - throw(css::uno::RuntimeException, std::exception) { if (! _xSuperClass.is()) { @@ -324,7 +312,6 @@ Sequence< Reference< XIdlClass > > CompoundIdlClassImpl::getSuperclasses() } Reference< XIdlField > CompoundIdlClassImpl::getField( const OUString & rName ) - throw(css::uno::RuntimeException, std::exception) { if (! _pFields) getFields(); // init fields @@ -337,7 +324,6 @@ Reference< XIdlField > CompoundIdlClassImpl::getField( const OUString & rName ) } Sequence< Reference< XIdlField > > CompoundIdlClassImpl::getFields() - throw(css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _pFields) diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index 3d1793e0363f..999493113584 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -71,7 +71,6 @@ IdlReflectionServiceImpl::~IdlReflectionServiceImpl() {} // XInterface Any IdlReflectionServiceImpl::queryInterface( const Type & rType ) - throw(css::uno::RuntimeException, std::exception) { Any aRet( ::cppu::queryInterface( rType, @@ -95,7 +94,6 @@ void IdlReflectionServiceImpl::release() throw() // XTypeProvider Sequence< Type > IdlReflectionServiceImpl::getTypes() - throw (css::uno::RuntimeException, std::exception) { static OTypeCollection * s_pTypes = nullptr; if (! s_pTypes) @@ -115,7 +113,6 @@ Sequence< Type > IdlReflectionServiceImpl::getTypes() } Sequence< sal_Int8 > IdlReflectionServiceImpl::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -123,7 +120,6 @@ Sequence< sal_Int8 > IdlReflectionServiceImpl::getImplementationId() // XComponent void IdlReflectionServiceImpl::dispose() - throw(css::uno::RuntimeException, std::exception) { OComponentHelper::dispose(); @@ -143,19 +139,16 @@ void IdlReflectionServiceImpl::dispose() // XServiceInfo OUString IdlReflectionServiceImpl::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return core_getImplementationName(); } sal_Bool IdlReflectionServiceImpl::supportsService( const OUString & rServiceName ) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > IdlReflectionServiceImpl::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { return core_getSupportedServiceNames(); } @@ -163,7 +156,6 @@ Sequence< OUString > IdlReflectionServiceImpl::getSupportedServiceNames() // XIdlReflection Reference< XIdlClass > IdlReflectionServiceImpl::getType( const Any & rObj ) - throw(css::uno::RuntimeException, std::exception) { return (rObj.hasValue() ? forType( rObj.getValueTypeRef() ) : Reference< XIdlClass >()); } @@ -215,7 +207,6 @@ inline Reference< XIdlClass > IdlReflectionServiceImpl::constructClass( } Reference< XIdlClass > IdlReflectionServiceImpl::forName( const OUString & rTypeName ) - throw(css::uno::RuntimeException, std::exception) { Reference< XIdlClass > xRet; Any aAny( _aElements.getValue( rTypeName ) ); @@ -243,7 +234,6 @@ Reference< XIdlClass > IdlReflectionServiceImpl::forName( const OUString & rType // XHierarchicalNameAccess Any IdlReflectionServiceImpl::getByHierarchicalName( const OUString & rName ) - throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) { Any aRet( _aElements.getValue( rName ) ); if (! aRet.hasValue()) @@ -297,7 +287,6 @@ Any IdlReflectionServiceImpl::getByHierarchicalName( const OUString & rName ) } sal_Bool IdlReflectionServiceImpl::hasByHierarchicalName( const OUString & rName ) - throw(css::uno::RuntimeException, std::exception) { try { @@ -311,7 +300,6 @@ sal_Bool IdlReflectionServiceImpl::hasByHierarchicalName( const OUString & rName Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescription * pTypeDescr ) - throw(css::uno::RuntimeException) { Reference< XIdlClass > xRet; OUString aName( pTypeDescr->pTypeName ); @@ -331,7 +319,6 @@ Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescriptio } Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescriptionReference * pRef ) - throw(css::uno::RuntimeException) { typelib_TypeDescription * pTD = nullptr; TYPELIB_DANGER_GET( &pTD, pRef ); @@ -348,7 +335,6 @@ Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescriptio const Mapping & IdlReflectionServiceImpl::getCpp2Uno() - throw(css::uno::RuntimeException) { if (! _aCpp2Uno.is()) { @@ -371,7 +357,6 @@ const Mapping & IdlReflectionServiceImpl::getCpp2Uno() } const Mapping & IdlReflectionServiceImpl::getUno2Cpp() - throw(css::uno::RuntimeException) { if (! _aUno2Cpp.is()) { @@ -395,7 +380,6 @@ const Mapping & IdlReflectionServiceImpl::getUno2Cpp() uno_Interface * IdlReflectionServiceImpl::mapToUno( const Any & rObj, typelib_InterfaceTypeDescription * pTo ) - throw(css::uno::RuntimeException) { Reference< XInterface > xObj; if (extract( rObj, pTo, xObj, this )) @@ -409,7 +393,6 @@ uno_Interface * IdlReflectionServiceImpl::mapToUno( /// @throws css::uno::Exception Reference< XInterface > SAL_CALL IdlReflectionServiceImpl_create( const Reference< XComponentContext > & xContext ) - throw(css::uno::Exception) { return Reference< XInterface >( static_cast<XWeak *>(static_cast<OWeakObject *>(new IdlReflectionServiceImpl( xContext ))) ); } diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx index 594897049fef..b5a4f1ca1fcf 100644 --- a/stoc/source/corereflection/crenum.cxx +++ b/stoc/source/corereflection/crenum.cxx @@ -44,30 +44,29 @@ public: {} // XInterface - virtual Any SAL_CALL queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual Any SAL_CALL queryInterface( const Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual Sequence< Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override; + virtual Sequence< Type > SAL_CALL getTypes() override; + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XIdlMember - virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; + virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() override; + virtual OUString SAL_CALL getName() override; // XIdlField - virtual Reference< XIdlClass > SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override; - virtual FieldAccessMode SAL_CALL getAccessMode() throw(css::uno::RuntimeException, std::exception) override; - virtual Any SAL_CALL get( const Any & rObj ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL set( const Any & rObj, const Any & rValue ) throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; + virtual Reference< XIdlClass > SAL_CALL getType() override; + virtual FieldAccessMode SAL_CALL getAccessMode() override; + virtual Any SAL_CALL get( const Any & rObj ) override; + virtual void SAL_CALL set( const Any & rObj, const Any & rValue ) override; // XIdlField2: getType, getAccessMode and get are equal to XIdlField - virtual void SAL_CALL set( Any & rObj, const Any & rValue ) throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL set( Any & rObj, const Any & rValue ) override; }; // XInterface Any IdlEnumFieldImpl::queryInterface( const Type & rType ) - throw(css::uno::RuntimeException, std::exception) { Any aRet( ::cppu::queryInterface( rType, static_cast< XIdlField * >( this ), @@ -88,7 +87,6 @@ void IdlEnumFieldImpl::release() throw() // XTypeProvider Sequence< Type > IdlEnumFieldImpl::getTypes() - throw (css::uno::RuntimeException, std::exception) { static ::cppu::OTypeCollection * s_pTypes = nullptr; if (! s_pTypes) @@ -107,7 +105,6 @@ Sequence< Type > IdlEnumFieldImpl::getTypes() } Sequence< sal_Int8 > IdlEnumFieldImpl::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -115,13 +112,11 @@ Sequence< sal_Int8 > IdlEnumFieldImpl::getImplementationId() // XIdlMember Reference< XIdlClass > IdlEnumFieldImpl::getDeclaringClass() - throw(css::uno::RuntimeException, std::exception) { return IdlMemberImpl::getDeclaringClass(); } OUString IdlEnumFieldImpl::getName() - throw(css::uno::RuntimeException, std::exception) { return IdlMemberImpl::getName(); } @@ -129,25 +124,21 @@ OUString IdlEnumFieldImpl::getName() // XIdlField Reference< XIdlClass > IdlEnumFieldImpl::getType() - throw(css::uno::RuntimeException, std::exception) { return getDeclaringClass(); } FieldAccessMode IdlEnumFieldImpl::getAccessMode() - throw(css::uno::RuntimeException, std::exception) { return FieldAccessMode_READONLY; } Any IdlEnumFieldImpl::get( const Any & ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { return Any( &_nValue, getTypeDescr() ); } void IdlEnumFieldImpl::set( const Any &, const Any & ) - throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) { throw IllegalAccessException( "enum field is constant!", @@ -155,7 +146,6 @@ void IdlEnumFieldImpl::set( const Any &, const Any & ) } void IdlEnumFieldImpl::set( Any &, const Any & ) - throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) { throw IllegalAccessException( "enum field is constant!", @@ -170,7 +160,6 @@ EnumIdlClassImpl::~EnumIdlClassImpl() // IdlClassImpl modifications Reference< XIdlField > EnumIdlClassImpl::getField( const OUString & rName ) - throw(css::uno::RuntimeException, std::exception) { if (! _pFields) getFields(); // init members @@ -183,7 +172,6 @@ Reference< XIdlField > EnumIdlClassImpl::getField( const OUString & rName ) } Sequence< Reference< XIdlField > > EnumIdlClassImpl::getFields() - throw(css::uno::RuntimeException, std::exception) { if (! _pFields) { @@ -209,7 +197,6 @@ Sequence< Reference< XIdlField > > EnumIdlClassImpl::getFields() } void EnumIdlClassImpl::createObject( Any & rObj ) - throw(css::uno::RuntimeException, std::exception) { sal_Int32 eVal = reinterpret_cast<typelib_EnumTypeDescription *>(IdlClassImpl::getTypeDescr())->nDefaultEnumValue; diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index d61123cc1558..254f1a35267d 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -59,24 +59,24 @@ public: {} // XInterface - virtual Any SAL_CALL queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual Any SAL_CALL queryInterface( const Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual Sequence< Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override; + virtual Sequence< Type > SAL_CALL getTypes() override; + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XIdlMember - virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; + virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() override; + virtual OUString SAL_CALL getName() override; // XIdlField - virtual Reference< XIdlClass > SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override; - virtual FieldAccessMode SAL_CALL getAccessMode() throw(css::uno::RuntimeException, std::exception) override; - virtual Any SAL_CALL get( const Any & rObj ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL set( const Any & rObj, const Any & rValue ) throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; + virtual Reference< XIdlClass > SAL_CALL getType() override; + virtual FieldAccessMode SAL_CALL getAccessMode() override; + virtual Any SAL_CALL get( const Any & rObj ) override; + virtual void SAL_CALL set( const Any & rObj, const Any & rValue ) override; // XIdlField2: getType, getAccessMode and get are equal to XIdlField - virtual void SAL_CALL set( Any & rObj, const Any & rValue ) throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL set( Any & rObj, const Any & rValue ) override; private: void checkException( @@ -86,7 +86,6 @@ private: // XInterface Any IdlAttributeFieldImpl::queryInterface( const Type & rType ) - throw(css::uno::RuntimeException, std::exception) { Any aRet( ::cppu::queryInterface( rType, static_cast< XIdlField * >( this ), @@ -107,7 +106,6 @@ void IdlAttributeFieldImpl::release() throw() // XTypeProvider Sequence< Type > IdlAttributeFieldImpl::getTypes() - throw (css::uno::RuntimeException, std::exception) { static ::cppu::OTypeCollection * s_pTypes = nullptr; if (! s_pTypes) @@ -126,7 +124,6 @@ Sequence< Type > IdlAttributeFieldImpl::getTypes() } Sequence< sal_Int8 > IdlAttributeFieldImpl::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -134,7 +131,6 @@ Sequence< sal_Int8 > IdlAttributeFieldImpl::getImplementationId() // XIdlMember Reference< XIdlClass > IdlAttributeFieldImpl::getDeclaringClass() - throw(css::uno::RuntimeException, std::exception) { if (! _xDeclClass.is()) { @@ -151,7 +147,6 @@ Reference< XIdlClass > IdlAttributeFieldImpl::getDeclaringClass() } OUString IdlAttributeFieldImpl::getName() - throw(css::uno::RuntimeException, std::exception) { return IdlMemberImpl::getName(); } @@ -159,21 +154,18 @@ OUString IdlAttributeFieldImpl::getName() // XIdlField Reference< XIdlClass > IdlAttributeFieldImpl::getType() - throw(css::uno::RuntimeException, std::exception) { return getReflection()->forType( getAttributeTypeDescr()->pAttributeTypeRef ); } FieldAccessMode IdlAttributeFieldImpl::getAccessMode() - throw(css::uno::RuntimeException, std::exception) { return ((getAttributeTypeDescr())->bReadOnly ? FieldAccessMode_READONLY : FieldAccessMode_READWRITE); } Any IdlAttributeFieldImpl::get( const Any & rObj ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { uno_Interface * pUnoI = getReflection()->mapToUno( rObj, reinterpret_cast<typelib_InterfaceTypeDescription *>(getDeclTypeDescr()) ); @@ -204,7 +196,6 @@ Any IdlAttributeFieldImpl::get( const Any & rObj ) } void IdlAttributeFieldImpl::set( Any & rObj, const Any & rValue ) - throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) { if (getAttributeTypeDescr()->bReadOnly) { @@ -291,7 +282,6 @@ void IdlAttributeFieldImpl::set( Any & rObj, const Any & rValue ) } void IdlAttributeFieldImpl::set( const Any & rObj, const Any & rValue ) - throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) { IdlAttributeFieldImpl::set( const_cast< Any & >( rObj ), rValue ); } @@ -342,24 +332,24 @@ public: virtual ~IdlInterfaceMethodImpl() override; // XInterface - virtual Any SAL_CALL queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual Any SAL_CALL queryInterface( const Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual Sequence< Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override; + virtual Sequence< Type > SAL_CALL getTypes() override; + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XIdlMember - virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; + virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() override; + virtual OUString SAL_CALL getName() override; // XIdlMethod - virtual Reference< XIdlClass > SAL_CALL getReturnType() throw(css::uno::RuntimeException, std::exception) override; - virtual Sequence< Reference< XIdlClass > > SAL_CALL getParameterTypes() throw(css::uno::RuntimeException, std::exception) override; - virtual Sequence< ParamInfo > SAL_CALL getParameterInfos() throw(css::uno::RuntimeException, std::exception) override; - virtual Sequence< Reference< XIdlClass > > SAL_CALL getExceptionTypes() throw(css::uno::RuntimeException, std::exception) override; - virtual MethodMode SAL_CALL getMode() throw(css::uno::RuntimeException, std::exception) override; - virtual Any SAL_CALL invoke( const Any & rObj, Sequence< Any > & rArgs ) throw(css::lang::IllegalArgumentException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; + virtual Reference< XIdlClass > SAL_CALL getReturnType() override; + virtual Sequence< Reference< XIdlClass > > SAL_CALL getParameterTypes() override; + virtual Sequence< ParamInfo > SAL_CALL getParameterInfos() override; + virtual Sequence< Reference< XIdlClass > > SAL_CALL getExceptionTypes() override; + virtual MethodMode SAL_CALL getMode() override; + virtual Any SAL_CALL invoke( const Any & rObj, Sequence< Any > & rArgs ) override; }; IdlInterfaceMethodImpl::~IdlInterfaceMethodImpl() @@ -372,7 +362,6 @@ IdlInterfaceMethodImpl::~IdlInterfaceMethodImpl() // XInterface Any IdlInterfaceMethodImpl::queryInterface( const Type & rType ) - throw(css::uno::RuntimeException, std::exception) { Any aRet( ::cppu::queryInterface( rType, static_cast< XIdlMethod * >( this ) ) ); return (aRet.hasValue() ? aRet : IdlMemberImpl::queryInterface( rType )); @@ -391,7 +380,6 @@ void IdlInterfaceMethodImpl::release() throw() // XTypeProvider Sequence< Type > IdlInterfaceMethodImpl::getTypes() - throw (css::uno::RuntimeException, std::exception) { static ::cppu::OTypeCollection * s_pTypes = nullptr; if (! s_pTypes) @@ -409,7 +397,6 @@ Sequence< Type > IdlInterfaceMethodImpl::getTypes() } Sequence< sal_Int8 > IdlInterfaceMethodImpl::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -417,7 +404,6 @@ Sequence< sal_Int8 > IdlInterfaceMethodImpl::getImplementationId() // XIdlMember Reference< XIdlClass > IdlInterfaceMethodImpl::getDeclaringClass() - throw(css::uno::RuntimeException, std::exception) { if (! _xDeclClass.is()) { @@ -434,7 +420,6 @@ Reference< XIdlClass > IdlInterfaceMethodImpl::getDeclaringClass() } OUString IdlInterfaceMethodImpl::getName() - throw(css::uno::RuntimeException, std::exception) { return IdlMemberImpl::getName(); } @@ -442,13 +427,11 @@ OUString IdlInterfaceMethodImpl::getName() // XIdlMethod Reference< XIdlClass > SAL_CALL IdlInterfaceMethodImpl::getReturnType() - throw(css::uno::RuntimeException, std::exception) { return getReflection()->forType( getMethodTypeDescr()->pReturnTypeRef ); } Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getExceptionTypes() - throw(css::uno::RuntimeException, std::exception) { if (! _pExceptionTypes) { @@ -474,7 +457,6 @@ Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getExceptionTypes() } Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getParameterTypes() - throw(css::uno::RuntimeException, std::exception) { if (! _pParamTypes) { @@ -500,7 +482,6 @@ Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getParameterTypes() } Sequence< ParamInfo > IdlInterfaceMethodImpl::getParameterInfos() - throw(css::uno::RuntimeException, std::exception) { if (! _pParamInfos) { @@ -560,16 +541,12 @@ Sequence< ParamInfo > IdlInterfaceMethodImpl::getParameterInfos() } MethodMode SAL_CALL IdlInterfaceMethodImpl::getMode() - throw(css::uno::RuntimeException, std::exception) { return getMethodTypeDescr()->bOneWay ? MethodMode_ONEWAY : MethodMode_TWOWAY; } Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > & rArgs ) - throw(css::lang::IllegalArgumentException, - css::reflection::InvocationTargetException, - css::uno::RuntimeException, std::exception) { if (auto ifc = o3tl::tryAccess<css::uno::Reference<css::uno::XInterface>>( rObj)) @@ -765,7 +742,6 @@ InterfaceIdlClassImpl::~InterfaceIdlClassImpl() Sequence< Reference< XIdlClass > > InterfaceIdlClassImpl::getSuperclasses() - throw(css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(getMutexAccess()); if (_xSuperClasses.getLength() == 0) { @@ -813,7 +789,6 @@ void InterfaceIdlClassImpl::initMembers() } sal_Bool InterfaceIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType ) - throw(css::uno::RuntimeException, std::exception) { if (xType.is() && xType->getTypeClass() == TypeClass_INTERFACE) { @@ -833,14 +808,12 @@ sal_Bool InterfaceIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & } Uik InterfaceIdlClassImpl::getUik() - throw(css::uno::RuntimeException, std::exception) { return Uik(0, 0, 0, 0, 0); // Uiks are deprecated and this function must not be called } Sequence< Reference< XIdlMethod > > InterfaceIdlClassImpl::getMethods() - throw(css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _pSortedMemberInit) @@ -860,7 +833,6 @@ Sequence< Reference< XIdlMethod > > InterfaceIdlClassImpl::getMethods() } Sequence< Reference< XIdlField > > InterfaceIdlClassImpl::getFields() - throw(css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _pSortedMemberInit) @@ -880,7 +852,6 @@ Sequence< Reference< XIdlField > > InterfaceIdlClassImpl::getFields() } Reference< XIdlMethod > InterfaceIdlClassImpl::getMethod( const OUString & rName ) - throw(css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _pSortedMemberInit) @@ -910,7 +881,6 @@ Reference< XIdlMethod > InterfaceIdlClassImpl::getMethod( const OUString & rName } Reference< XIdlField > InterfaceIdlClassImpl::getField( const OUString & rName ) - throw(css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _pSortedMemberInit) @@ -940,7 +910,6 @@ Reference< XIdlField > InterfaceIdlClassImpl::getField( const OUString & rName ) } void InterfaceIdlClassImpl::createObject( Any & rObj ) - throw(css::uno::RuntimeException, std::exception) { // interfaces cannot be constructed rObj.clear(); |