diff options
Diffstat (limited to 'stoc')
32 files changed, 574 insertions, 1237 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(); diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index 75ee807f335b..4f3069904ce0 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -53,28 +53,27 @@ public: NestedRegistryImpl( ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) - throw(Exception, RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override; // XSimpleRegistry - virtual OUString SAL_CALL getURL() throw(RuntimeException, std::exception) override; - virtual void SAL_CALL open( const OUString& rURL, sal_Bool bReadOnly, sal_Bool bCreate ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isValid( ) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL close( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual void SAL_CALL destroy( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Reference< XRegistryKey > SAL_CALL getRootKey( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual void SAL_CALL mergeKey( const OUString& aKeyName, const OUString& aUrl ) throw(InvalidRegistryException, MergeConflictException, RuntimeException, std::exception) override; + virtual OUString SAL_CALL getURL() override; + virtual void SAL_CALL open( const OUString& rURL, sal_Bool bReadOnly, sal_Bool bCreate ) override; + virtual sal_Bool SAL_CALL isValid( ) override; + virtual void SAL_CALL close( ) override; + virtual void SAL_CALL destroy( ) override; + virtual Reference< XRegistryKey > SAL_CALL getRootKey( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL mergeKey( const OUString& aKeyName, const OUString& aUrl ) override; // XEnumerationAccess - virtual Reference< XEnumeration > SAL_CALL createEnumeration( ) throw (RuntimeException, std::exception) override; - virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) override; + virtual Reference< XEnumeration > SAL_CALL createEnumeration( ) override; + virtual Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; friend class NestedKeyImpl; protected: @@ -99,35 +98,35 @@ public: NestedKeyImpl* pKey); // XRegistryKey - virtual OUString SAL_CALL getKeyName() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isValid( ) throw(RuntimeException, std::exception) override; - virtual RegistryKeyType SAL_CALL getKeyType( const OUString& rKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual RegistryValueType SAL_CALL getValueType( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getLongValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override; - virtual void SAL_CALL setLongValue( sal_Int32 value ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Sequence< sal_Int32 > SAL_CALL getLongListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override; - virtual void SAL_CALL setLongListValue( const css::uno::Sequence< sal_Int32 >& seqValue ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAsciiValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override; - virtual void SAL_CALL setAsciiValue( const OUString& value ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getAsciiListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override; - virtual void SAL_CALL setAsciiListValue( const css::uno::Sequence< OUString >& seqValue ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual OUString SAL_CALL getStringValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override; - virtual void SAL_CALL setStringValue( const OUString& value ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getStringListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override; - virtual void SAL_CALL setStringListValue( const css::uno::Sequence< OUString >& seqValue ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Sequence< sal_Int8 > SAL_CALL getBinaryValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override; - virtual void SAL_CALL setBinaryValue( const css::uno::Sequence< sal_Int8 >& value ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Reference< XRegistryKey > SAL_CALL openKey( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Reference< XRegistryKey > SAL_CALL createKey( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual void SAL_CALL closeKey( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual void SAL_CALL deleteKey( const OUString& rKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Sequence< Reference< XRegistryKey > > SAL_CALL openKeys( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getKeyNames( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL createLink( const OUString& aLinkName, const OUString& aLinkTarget ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual void SAL_CALL deleteLink( const OUString& rLinkName ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLinkTarget( const OUString& rLinkName ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual OUString SAL_CALL getResolvedName( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override; + virtual OUString SAL_CALL getKeyName() override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL isValid( ) override; + virtual RegistryKeyType SAL_CALL getKeyType( const OUString& rKeyName ) override; + virtual RegistryValueType SAL_CALL getValueType( ) override; + virtual sal_Int32 SAL_CALL getLongValue( ) override; + virtual void SAL_CALL setLongValue( sal_Int32 value ) override; + virtual Sequence< sal_Int32 > SAL_CALL getLongListValue( ) override; + virtual void SAL_CALL setLongListValue( const css::uno::Sequence< sal_Int32 >& seqValue ) override; + virtual OUString SAL_CALL getAsciiValue( ) override; + virtual void SAL_CALL setAsciiValue( const OUString& value ) override; + virtual Sequence< OUString > SAL_CALL getAsciiListValue( ) override; + virtual void SAL_CALL setAsciiListValue( const css::uno::Sequence< OUString >& seqValue ) override; + virtual OUString SAL_CALL getStringValue( ) override; + virtual void SAL_CALL setStringValue( const OUString& value ) override; + virtual Sequence< OUString > SAL_CALL getStringListValue( ) override; + virtual void SAL_CALL setStringListValue( const css::uno::Sequence< OUString >& seqValue ) override; + virtual Sequence< sal_Int8 > SAL_CALL getBinaryValue( ) override; + virtual void SAL_CALL setBinaryValue( const css::uno::Sequence< sal_Int8 >& value ) override; + virtual Reference< XRegistryKey > SAL_CALL openKey( const OUString& aKeyName ) override; + virtual Reference< XRegistryKey > SAL_CALL createKey( const OUString& aKeyName ) override; + virtual void SAL_CALL closeKey( ) override; + virtual void SAL_CALL deleteKey( const OUString& rKeyName ) override; + virtual Sequence< Reference< XRegistryKey > > SAL_CALL openKeys( ) override; + virtual Sequence< OUString > SAL_CALL getKeyNames( ) override; + virtual sal_Bool SAL_CALL createLink( const OUString& aLinkName, const OUString& aLinkTarget ) override; + virtual void SAL_CALL deleteLink( const OUString& rLinkName ) override; + virtual OUString SAL_CALL getLinkTarget( const OUString& rLinkName ) override; + virtual OUString SAL_CALL getResolvedName( const OUString& aKeyName ) override; protected: void computeChanges(); @@ -253,7 +252,7 @@ OUString NestedKeyImpl::computeName(const OUString& name) } -OUString SAL_CALL NestedKeyImpl::getKeyName() throw(RuntimeException, std::exception) +OUString SAL_CALL NestedKeyImpl::getKeyName() { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); return m_name; @@ -261,7 +260,6 @@ OUString SAL_CALL NestedKeyImpl::getKeyName() throw(RuntimeException, std::excep sal_Bool SAL_CALL NestedKeyImpl::isReadOnly( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -273,7 +271,7 @@ sal_Bool SAL_CALL NestedKeyImpl::isReadOnly( ) } -sal_Bool SAL_CALL NestedKeyImpl::isValid( ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL NestedKeyImpl::isValid( ) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); return ((m_localKey.is() && m_localKey->isValid()) || @@ -282,7 +280,6 @@ sal_Bool SAL_CALL NestedKeyImpl::isValid( ) throw(RuntimeException, std::except RegistryKeyType SAL_CALL NestedKeyImpl::getKeyType( const OUString& rKeyName ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -301,7 +298,6 @@ RegistryKeyType SAL_CALL NestedKeyImpl::getKeyType( const OUString& rKeyName ) RegistryValueType SAL_CALL NestedKeyImpl::getValueType( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -320,7 +316,6 @@ RegistryValueType SAL_CALL NestedKeyImpl::getValueType( ) sal_Int32 SAL_CALL NestedKeyImpl::getLongValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -341,7 +336,6 @@ sal_Int32 SAL_CALL NestedKeyImpl::getLongValue( ) void SAL_CALL NestedKeyImpl::setLongValue( sal_Int32 value ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -365,7 +359,6 @@ void SAL_CALL NestedKeyImpl::setLongValue( sal_Int32 value ) Sequence< sal_Int32 > SAL_CALL NestedKeyImpl::getLongListValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -386,7 +379,6 @@ Sequence< sal_Int32 > SAL_CALL NestedKeyImpl::getLongListValue( ) void SAL_CALL NestedKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqValue ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -410,7 +402,6 @@ void SAL_CALL NestedKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqV OUString SAL_CALL NestedKeyImpl::getAsciiValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -431,7 +422,6 @@ OUString SAL_CALL NestedKeyImpl::getAsciiValue( ) void SAL_CALL NestedKeyImpl::setAsciiValue( const OUString& value ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -455,7 +445,6 @@ void SAL_CALL NestedKeyImpl::setAsciiValue( const OUString& value ) Sequence< OUString > SAL_CALL NestedKeyImpl::getAsciiListValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -476,7 +465,6 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getAsciiListValue( ) void SAL_CALL NestedKeyImpl::setAsciiListValue( const Sequence< OUString >& seqValue ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -500,7 +488,6 @@ void SAL_CALL NestedKeyImpl::setAsciiListValue( const Sequence< OUString >& seqV OUString SAL_CALL NestedKeyImpl::getStringValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -521,7 +508,6 @@ OUString SAL_CALL NestedKeyImpl::getStringValue( ) void SAL_CALL NestedKeyImpl::setStringValue( const OUString& value ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -545,7 +531,6 @@ void SAL_CALL NestedKeyImpl::setStringValue( const OUString& value ) Sequence< OUString > SAL_CALL NestedKeyImpl::getStringListValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -566,7 +551,6 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getStringListValue( ) void SAL_CALL NestedKeyImpl::setStringListValue( const Sequence< OUString >& seqValue ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -590,7 +574,6 @@ void SAL_CALL NestedKeyImpl::setStringListValue( const Sequence< OUString >& seq Sequence< sal_Int8 > SAL_CALL NestedKeyImpl::getBinaryValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -611,7 +594,6 @@ Sequence< sal_Int8 > SAL_CALL NestedKeyImpl::getBinaryValue( ) void SAL_CALL NestedKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -635,7 +617,6 @@ void SAL_CALL NestedKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value ) Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( const OUString& aKeyName ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -671,7 +652,6 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( const OUString& aKeyN Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKeyName ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( (!m_localKey.is() && !m_defaultKey.is()) || @@ -729,7 +709,6 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKe void SAL_CALL NestedKeyImpl::closeKey( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( m_localKey.is() && m_localKey->isValid() ) @@ -744,7 +723,6 @@ void SAL_CALL NestedKeyImpl::closeKey( ) void SAL_CALL NestedKeyImpl::deleteKey( const OUString& rKeyName ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( m_localKey.is() && m_localKey->isValid() && @@ -767,7 +745,6 @@ void SAL_CALL NestedKeyImpl::deleteKey( const OUString& rKeyName ) Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -846,7 +823,6 @@ Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys( ) Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -912,7 +888,6 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames( ) sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OUString& aLinkTarget ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); @@ -970,7 +945,6 @@ sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OU void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -1016,7 +990,6 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName ) OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -1070,7 +1043,6 @@ OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName ) OUString SAL_CALL NestedKeyImpl::getResolvedName( const OUString& aKeyName ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -1105,21 +1077,20 @@ public: : m_xReg1( r1 ) , m_xReg2( r2 ) {} public: - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements( ) override; + virtual Any SAL_CALL nextElement( ) override; private: Reference< XSimpleRegistry > m_xReg1; Reference< XSimpleRegistry > m_xReg2; }; -sal_Bool RegistryEnumueration::hasMoreElements( ) throw (RuntimeException, std::exception) +sal_Bool RegistryEnumueration::hasMoreElements( ) { return m_xReg1.is() || m_xReg2.is(); } Any RegistryEnumueration::nextElement( ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { Any a; if( m_xReg1.is() ) @@ -1140,18 +1111,18 @@ Any RegistryEnumueration::nextElement( ) } -Reference< XEnumeration > NestedRegistryImpl::createEnumeration( ) throw (RuntimeException, std::exception) +Reference< XEnumeration > NestedRegistryImpl::createEnumeration( ) { MutexGuard guard( m_mutex ); return new RegistryEnumueration( m_localReg, m_defaultReg ); } -Type NestedRegistryImpl::getElementType( ) throw (RuntimeException, std::exception) +Type NestedRegistryImpl::getElementType( ) { return cppu::UnoType<decltype(m_localReg)>::get(); } -sal_Bool SAL_CALL NestedRegistryImpl::hasElements( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL NestedRegistryImpl::hasElements( ) { MutexGuard guard( m_mutex ); return m_localReg.is() || m_defaultReg.is(); @@ -1159,19 +1130,16 @@ sal_Bool SAL_CALL NestedRegistryImpl::hasElements( ) throw (RuntimeException, s OUString SAL_CALL NestedRegistryImpl::getImplementationName( ) - throw(RuntimeException, std::exception) { return OUString("com.sun.star.comp.stoc.NestedRegistry"); } sal_Bool SAL_CALL NestedRegistryImpl::supportsService( const OUString& ServiceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence<OUString> SAL_CALL NestedRegistryImpl::getSupportedServiceNames( ) - throw(RuntimeException, std::exception) { Sequence< OUString > seqNames { "com.sun.star.registry.NestedRegistry" }; return seqNames; @@ -1179,7 +1147,6 @@ Sequence<OUString> SAL_CALL NestedRegistryImpl::getSupportedServiceNames( ) void SAL_CALL NestedRegistryImpl::initialize( const Sequence< Any >& aArguments ) - throw( Exception, RuntimeException, std::exception ) { Guard< Mutex > aGuard( m_mutex ); if ( (aArguments.getLength() == 2) && @@ -1194,7 +1161,7 @@ void SAL_CALL NestedRegistryImpl::initialize( const Sequence< Any >& aArguments } -OUString SAL_CALL NestedRegistryImpl::getURL() throw(RuntimeException, std::exception) +OUString SAL_CALL NestedRegistryImpl::getURL() { Guard< Mutex > aGuard( m_mutex ); try @@ -1211,14 +1178,13 @@ OUString SAL_CALL NestedRegistryImpl::getURL() throw(RuntimeException, std::exce void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool ) - throw(InvalidRegistryException, RuntimeException, std::exception) { throw InvalidRegistryException( "the 'open' method is not specified for a nested registry" ); } -sal_Bool SAL_CALL NestedRegistryImpl::isValid( ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL NestedRegistryImpl::isValid( ) { Guard< Mutex > aGuard( m_mutex ); try @@ -1236,7 +1202,6 @@ sal_Bool SAL_CALL NestedRegistryImpl::isValid( ) throw(RuntimeException, std::e void SAL_CALL NestedRegistryImpl::close( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_mutex ); if ( m_localReg.is() && m_localReg->isValid() ) @@ -1251,7 +1216,6 @@ void SAL_CALL NestedRegistryImpl::close( ) void SAL_CALL NestedRegistryImpl::destroy( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { throw InvalidRegistryException( "the 'destroy' method is not specified for a nested registry" ); @@ -1259,7 +1223,6 @@ void SAL_CALL NestedRegistryImpl::destroy( ) Reference< XRegistryKey > SAL_CALL NestedRegistryImpl::getRootKey( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Reference<XRegistryKey> tmpKey; @@ -1290,7 +1253,6 @@ Reference< XRegistryKey > SAL_CALL NestedRegistryImpl::getRootKey( ) sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_mutex ); try @@ -1307,7 +1269,6 @@ sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly( ) void SAL_CALL NestedRegistryImpl::mergeKey( const OUString& aKeyName, const OUString& aUrl ) - throw(InvalidRegistryException, MergeConflictException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_mutex ); if ( m_localReg.is() && m_localReg->isValid() ) diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index e174724df572..4dd08dcd9ba2 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -1198,42 +1198,36 @@ public: explicit ImplementationRegistration( const Reference < XComponentContext > & rSMgr ); // XServiceInfo - OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception) override; - Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XImplementationRegistration virtual void SAL_CALL registerImplementation( const OUString& implementationLoader, const OUString& location, - const Reference < XSimpleRegistry > & xReg) - throw( CannotRegisterImplementationException, RuntimeException, std::exception ) override; + const Reference < XSimpleRegistry > & xReg) override; virtual sal_Bool SAL_CALL revokeImplementation( const OUString& location, - const Reference < XSimpleRegistry >& xReg) - throw( RuntimeException, std::exception ) override; + const Reference < XSimpleRegistry >& xReg) override; virtual Sequence< OUString > SAL_CALL getImplementations( const OUString& implementationLoader, - const OUString& location) - throw( RuntimeException, std::exception ) override; + const OUString& location) override; virtual Sequence< OUString > SAL_CALL checkInstantiation( - const OUString& implementationName) - throw( RuntimeException, std::exception ) override; + const OUString& implementationName) override; // XImplementationRegistration2 virtual void SAL_CALL registerImplementationWithLocation( const OUString& implementationLoader, const OUString& location, const OUString& registeredLocation, - const Reference < XSimpleRegistry > & xReg) - throw( CannotRegisterImplementationException, RuntimeException, std::exception ) override; + const Reference < XSimpleRegistry > & xReg) 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; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; private: // helper methods void prepareRegister( @@ -1277,19 +1271,19 @@ ImplementationRegistration::ImplementationRegistration( const Reference < XCompo {} // XServiceInfo -OUString ImplementationRegistration::getImplementationName() throw(RuntimeException, std::exception) +OUString ImplementationRegistration::getImplementationName() { return OUString("com.sun.star.comp.stoc.ImplementationRegistration"); } // XServiceInfo -sal_Bool ImplementationRegistration::supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception) +sal_Bool ImplementationRegistration::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } // XServiceInfo -Sequence< OUString > ImplementationRegistration::getSupportedServiceNames() throw(RuntimeException, std::exception) +Sequence< OUString > ImplementationRegistration::getSupportedServiceNames() { Sequence< OUString > seqNames { "com.sun.star.registry.ImplementationRegistration" }; return seqNames; @@ -1323,7 +1317,6 @@ Reference< XSimpleRegistry > ImplementationRegistration::getRegistryFromServiceM void ImplementationRegistration::initialize( const css::uno::Sequence< css::uno::Any >& aArgs ) - throw( css::uno::Exception, css::uno::RuntimeException, std::exception) { if( aArgs.getLength() != 4 ) { @@ -1415,7 +1408,6 @@ void ImplementationRegistration::registerImplementationWithLocation( const OUString& locationUrl, const OUString& registeredLocationUrl, const Reference < XSimpleRegistry > & xReg) - throw( CannotRegisterImplementationException, RuntimeException, std::exception ) { prepareRegister( implementationLoaderUrl, locationUrl, registeredLocationUrl, xReg); @@ -1516,7 +1508,6 @@ void ImplementationRegistration::registerImplementation( const OUString& implementationLoaderUrl, const OUString& locationUrl, const Reference < XSimpleRegistry > & xReg) - throw( CannotRegisterImplementationException, RuntimeException, std::exception ) { prepareRegister(implementationLoaderUrl, locationUrl, locationUrl, xReg); } @@ -1526,7 +1517,6 @@ void ImplementationRegistration::registerImplementation( sal_Bool ImplementationRegistration::revokeImplementation(const OUString& location, const Reference < XSimpleRegistry >& xReg) - throw ( RuntimeException, std::exception ) { bool ret = false; @@ -1575,7 +1565,6 @@ sal_Bool ImplementationRegistration::revokeImplementation(const OUString& locati Sequence< OUString > ImplementationRegistration::getImplementations( const OUString & implementationLoaderUrl, const OUString & locationUrl) - throw ( RuntimeException, std::exception ) { OUString activatorName; @@ -1643,7 +1632,6 @@ Sequence< OUString > ImplementationRegistration::getImplementations( // virtual function checkInstantiation of XImplementationRegistration Sequence< OUString > ImplementationRegistration::checkInstantiation(const OUString&) - throw ( RuntimeException, std::exception ) { OSL_FAIL( "ImplementationRegistration::checkInstantiation not implemented" ); return Sequence<OUString>(); diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index da3b8c961ead..75443c0bd55a 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -706,115 +706,85 @@ public: ImplIntrospectionAccess( const Any& obj, rtl::Reference< IntrospectionAccessStatic_Impl > const & pStaticImpl_ ); // Methods from XIntrospectionAccess - virtual sal_Int32 SAL_CALL getSuppliedMethodConcepts() - throw( RuntimeException, std::exception ) override; - virtual sal_Int32 SAL_CALL getSuppliedPropertyConcepts() - throw( RuntimeException, std::exception ) override; - virtual Property SAL_CALL getProperty(const OUString& Name, sal_Int32 PropertyConcepts) - throw( NoSuchElementException, RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasProperty(const OUString& Name, sal_Int32 PropertyConcepts) - throw( RuntimeException, std::exception ) override; - virtual Sequence< Property > SAL_CALL getProperties(sal_Int32 PropertyConcepts) - throw( RuntimeException, std::exception ) override; - virtual Reference<XIdlMethod> SAL_CALL getMethod(const OUString& Name, sal_Int32 MethodConcepts) - throw( NoSuchMethodException, RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasMethod(const OUString& Name, sal_Int32 MethodConcepts) - throw( RuntimeException, std::exception ) override; - virtual Sequence< Reference<XIdlMethod> > SAL_CALL getMethods(sal_Int32 MethodConcepts) - throw( RuntimeException, std::exception ) override; - virtual Sequence< Type > SAL_CALL getSupportedListeners() - throw( RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getSuppliedMethodConcepts() override; + virtual sal_Int32 SAL_CALL getSuppliedPropertyConcepts() override; + virtual Property SAL_CALL getProperty(const OUString& Name, sal_Int32 PropertyConcepts) override; + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name, sal_Int32 PropertyConcepts) override; + virtual Sequence< Property > SAL_CALL getProperties(sal_Int32 PropertyConcepts) override; + virtual Reference<XIdlMethod> SAL_CALL getMethod(const OUString& Name, sal_Int32 MethodConcepts) override; + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name, sal_Int32 MethodConcepts) override; + virtual Sequence< Reference<XIdlMethod> > SAL_CALL getMethods(sal_Int32 MethodConcepts) override; + virtual Sequence< Type > SAL_CALL getSupportedListeners() override; using OWeakObject::queryAdapter; - virtual Reference<XInterface> SAL_CALL queryAdapter( const Type& rType ) - throw( IllegalTypeException, RuntimeException, std::exception ) override; + virtual Reference<XInterface> SAL_CALL queryAdapter( const Type& rType ) override; // Methods from XMaterialHolder - virtual Any SAL_CALL getMaterial() throw(RuntimeException, std::exception) override; + virtual Any SAL_CALL getMaterial() override; // Methods from XExactName - virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) throw( RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) override; // Methods from XInterface - virtual Any SAL_CALL queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) override; + virtual Any SAL_CALL queryInterface( const Type& rType ) override; virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } virtual void SAL_CALL release() throw() override { OWeakObject::release(); } // Methods from XPropertySet - virtual Reference<XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( RuntimeException, std::exception ) override; - virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const Any& aValue) - throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) override; - virtual Any SAL_CALL getPropertyValue(const OUString& aPropertyName) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override; - virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override; - virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override; - virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override; - virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override; + virtual Reference<XPropertySetInfo> SAL_CALL getPropertySetInfo() override; + virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const Any& aValue) override; + virtual Any SAL_CALL getPropertyValue(const OUString& aPropertyName) override; + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener) override; + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener) override; + virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener) override; + virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener) override; // Methods from XFastPropertySet - virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const Any& aValue) - throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) override; - virtual Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override; + virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const Any& aValue) override; + virtual Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override; // Methods from XPropertySetInfo - virtual Sequence< Property > SAL_CALL getProperties() throw( RuntimeException, std::exception ) override; - virtual Property SAL_CALL getPropertyByName(const OUString& Name) throw( RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& Name) throw( RuntimeException, std::exception ) override; + virtual Sequence< Property > SAL_CALL getProperties() override; + virtual Property SAL_CALL getPropertyByName(const OUString& Name) override; + virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& Name) override; // Methods from XElementAccess - virtual Type SAL_CALL getElementType() throw( RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasElements() throw( RuntimeException, std::exception ) override; + virtual Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // Methods from XNameAccess - virtual Any SAL_CALL getByName(const OUString& Name) - throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override; - virtual Sequence< OUString > SAL_CALL getElementNames() throw( RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( RuntimeException, std::exception ) override; + virtual Any SAL_CALL getByName(const OUString& Name) override; + virtual Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override; // Methods from XNameReplace - virtual void SAL_CALL replaceByName(const OUString& Name, const Any& Element) - throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override; + virtual void SAL_CALL replaceByName(const OUString& Name, const Any& Element) override; // Methods from XNameContainer - virtual void SAL_CALL insertByName(const OUString& Name, const Any& Element) - throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception ) override; - virtual void SAL_CALL removeByName(const OUString& Name) - throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override; + virtual void SAL_CALL insertByName(const OUString& Name, const Any& Element) override; + virtual void SAL_CALL removeByName(const OUString& Name) override; // Methods from XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( RuntimeException, std::exception ) override; - virtual Any SAL_CALL getByIndex(sal_Int32 Index) - throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual Any SAL_CALL getByIndex(sal_Int32 Index) override; // Methods from XIndexReplace - virtual void SAL_CALL replaceByIndex(sal_Int32 Index, const Any& Element) - throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override; + virtual void SAL_CALL replaceByIndex(sal_Int32 Index, const Any& Element) override; // Methods from XIndexContainer - virtual void SAL_CALL insertByIndex(sal_Int32 Index, const Any& Element) - throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override; - virtual void SAL_CALL removeByIndex(sal_Int32 Index) - throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override; + virtual void SAL_CALL insertByIndex(sal_Int32 Index, const Any& Element) override; + virtual void SAL_CALL removeByIndex(sal_Int32 Index) override; // Methods from XEnumerationAccess - virtual Reference<XEnumeration> SAL_CALL createEnumeration() throw( RuntimeException, std::exception ) override; + virtual Reference<XEnumeration> SAL_CALL createEnumeration() override; // Methods from XIdlArray - virtual void SAL_CALL realloc(Any& array, sal_Int32 length) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual sal_Int32 SAL_CALL getLen(const Any& array) throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual Any SAL_CALL get(const Any& array, sal_Int32 index) - throw( IllegalArgumentException, ArrayIndexOutOfBoundsException, RuntimeException, std::exception ) override; - virtual void SAL_CALL set(Any& array, sal_Int32 index, const Any& value) - throw( IllegalArgumentException, ArrayIndexOutOfBoundsException, RuntimeException, std::exception ) override; + virtual void SAL_CALL realloc(Any& array, sal_Int32 length) override; + virtual sal_Int32 SAL_CALL getLen(const Any& array) override; + virtual Any SAL_CALL get(const Any& array, sal_Int32 index) override; + virtual void SAL_CALL set(Any& array, sal_Int32 index, const Any& value) override; // Methods from XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >& aIdentifier ) - throw (RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >& aIdentifier ) override; }; ImplIntrospectionAccess::ImplIntrospectionAccess @@ -1011,7 +981,6 @@ Reference<XIdlArray> ImplIntrospectionAccess::getXIdlArray() // Methods from XInterface Any SAL_CALL ImplIntrospectionAccess::queryInterface( const Type& rType ) - throw( RuntimeException, std::exception ) { Any aRet( ::cppu::queryInterface( rType, @@ -1051,25 +1020,21 @@ Any SAL_CALL ImplIntrospectionAccess::queryInterface( const Type& rType ) // Methods from XPropertySet Reference<XPropertySetInfo> ImplIntrospectionAccess::getPropertySetInfo() - throw( RuntimeException, std::exception ) { return static_cast<XPropertySetInfo *>(this); } void ImplIntrospectionAccess::setPropertyValue(const OUString& aPropertyName, const Any& aValue) - throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { mpStaticImpl->setPropertyValue( maInspectedObject, aPropertyName, aValue ); } Any ImplIntrospectionAccess::getPropertyValue(const OUString& aPropertyName) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { return mpStaticImpl->getPropertyValue( maInspectedObject, aPropertyName ); } void ImplIntrospectionAccess::addPropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { if( mxIface.is() ) { @@ -1082,7 +1047,6 @@ void ImplIntrospectionAccess::addPropertyChangeListener(const OUString& aPropert } void ImplIntrospectionAccess::removePropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { if( mxIface.is() ) { @@ -1095,7 +1059,6 @@ void ImplIntrospectionAccess::removePropertyChangeListener(const OUString& aProp } void ImplIntrospectionAccess::addVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { if( mxIface.is() ) { @@ -1108,7 +1071,6 @@ void ImplIntrospectionAccess::addVetoableChangeListener(const OUString& aPropert } void ImplIntrospectionAccess::removeVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { if( mxIface.is() ) { @@ -1122,150 +1084,131 @@ void ImplIntrospectionAccess::removeVetoableChangeListener(const OUString& aProp // Methods from XFastPropertySet void ImplIntrospectionAccess::setFastPropertyValue(sal_Int32, const Any&) - throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { } Any ImplIntrospectionAccess::getFastPropertyValue(sal_Int32) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { return Any(); } // Methods from XPropertySetInfo -Sequence< Property > ImplIntrospectionAccess::getProperties() throw( RuntimeException, std::exception ) +Sequence< Property > ImplIntrospectionAccess::getProperties() { return comphelper::containerToSequence(mpStaticImpl->getProperties()); } Property ImplIntrospectionAccess::getPropertyByName(const OUString& Name) - throw( RuntimeException, std::exception ) { return getProperty( Name, PropertyConcept::ALL ); } sal_Bool ImplIntrospectionAccess::hasPropertyByName(const OUString& Name) - throw( RuntimeException, std::exception ) { return hasProperty( Name, PropertyConcept::ALL ); } // Methods from XElementAccess -Type ImplIntrospectionAccess::getElementType() throw( RuntimeException, std::exception ) +Type ImplIntrospectionAccess::getElementType() { return getXElementAccess()->getElementType(); } -sal_Bool ImplIntrospectionAccess::hasElements() throw( RuntimeException, std::exception ) +sal_Bool ImplIntrospectionAccess::hasElements() { return getXElementAccess()->hasElements(); } // Methods from XNameAccess Any ImplIntrospectionAccess::getByName(const OUString& Name) - throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) { return getXNameAccess()->getByName( Name ); } Sequence< OUString > ImplIntrospectionAccess::getElementNames() - throw( RuntimeException, std::exception ) { return getXNameAccess()->getElementNames(); } sal_Bool ImplIntrospectionAccess::hasByName(const OUString& Name) - throw( RuntimeException, std::exception ) { return getXNameAccess()->hasByName( Name ); } // Methods from XNameContainer void ImplIntrospectionAccess::insertByName(const OUString& Name, const Any& Element) - throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception ) { getXNameContainer()->insertByName( Name, Element ); } void ImplIntrospectionAccess::replaceByName(const OUString& Name, const Any& Element) - throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) { getXNameReplace()->replaceByName( Name, Element ); } void ImplIntrospectionAccess::removeByName(const OUString& Name) - throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) { getXNameContainer()->removeByName( Name ); } // Methods from XIndexAccess // Already in XNameAccess: virtual Reference<XIdlClass> getElementType() const -sal_Int32 ImplIntrospectionAccess::getCount() throw( RuntimeException, std::exception ) +sal_Int32 ImplIntrospectionAccess::getCount() { return getXIndexAccess()->getCount(); } Any ImplIntrospectionAccess::getByIndex(sal_Int32 Index) - throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { return getXIndexAccess()->getByIndex( Index ); } // Methods from XIndexContainer void ImplIntrospectionAccess::insertByIndex(sal_Int32 Index, const Any& Element) - throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { getXIndexContainer()->insertByIndex( Index, Element ); } void ImplIntrospectionAccess::replaceByIndex(sal_Int32 Index, const Any& Element) - throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { getXIndexReplace()->replaceByIndex( Index, Element ); } void ImplIntrospectionAccess::removeByIndex(sal_Int32 Index) - throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { getXIndexContainer()->removeByIndex( Index ); } // Methods from XEnumerationAccess // Already in XNameAccess: virtual Reference<XIdlClass> getElementType() const; -Reference<XEnumeration> ImplIntrospectionAccess::createEnumeration() throw( RuntimeException, std::exception ) +Reference<XEnumeration> ImplIntrospectionAccess::createEnumeration() { return getXEnumerationAccess()->createEnumeration(); } // Methods from XIdlArray void ImplIntrospectionAccess::realloc(Any& array, sal_Int32 length) - throw( IllegalArgumentException, RuntimeException, std::exception ) { getXIdlArray()->realloc( array, length ); } sal_Int32 ImplIntrospectionAccess::getLen(const Any& array) - throw( IllegalArgumentException, RuntimeException, std::exception ) { return getXIdlArray()->getLen( array ); } Any ImplIntrospectionAccess::get(const Any& array, sal_Int32 index) - throw( IllegalArgumentException, ArrayIndexOutOfBoundsException, RuntimeException, std::exception ) { return getXIdlArray()->get( array, index ); } void ImplIntrospectionAccess::set(Any& array, sal_Int32 index, const Any& value) - throw( IllegalArgumentException, ArrayIndexOutOfBoundsException, RuntimeException, std::exception ) { getXIdlArray()->set( array, index, value ); } // Methods from XUnoTunnel sal_Int64 ImplIntrospectionAccess::getSomething( const Sequence< sal_Int8 >& aIdentifier ) - throw (RuntimeException, std::exception) { return Reference<XUnoTunnel>::query( mxIface )->getSomething( aIdentifier ); } @@ -1275,7 +1218,6 @@ sal_Int64 ImplIntrospectionAccess::getSomething( const Sequence< sal_Int8 >& aId // Methods from XIntrospectionAccess sal_Int32 ImplIntrospectionAccess::getSuppliedMethodConcepts() - throw( RuntimeException, std::exception ) { return MethodConcept::DANGEROUS | PROPERTY | @@ -1286,7 +1228,6 @@ sal_Int32 ImplIntrospectionAccess::getSuppliedMethodConcepts() } sal_Int32 ImplIntrospectionAccess::getSuppliedPropertyConcepts() - throw( RuntimeException, std::exception ) { return PropertyConcept::DANGEROUS | PROPERTYSET | @@ -1295,7 +1236,6 @@ sal_Int32 ImplIntrospectionAccess::getSuppliedPropertyConcepts() } Property ImplIntrospectionAccess::getProperty(const OUString& Name, sal_Int32 PropertyConcepts) - throw( NoSuchElementException, RuntimeException, std::exception ) { Property aRet; sal_Int32 i = mpStaticImpl->getPropertyIndex( Name ); @@ -1315,7 +1255,6 @@ Property ImplIntrospectionAccess::getProperty(const OUString& Name, sal_Int32 Pr } sal_Bool ImplIntrospectionAccess::hasProperty(const OUString& Name, sal_Int32 PropertyConcepts) - throw( RuntimeException, std::exception ) { sal_Int32 i = mpStaticImpl->getPropertyIndex( Name ); bool bRet = false; @@ -1329,7 +1268,6 @@ sal_Bool ImplIntrospectionAccess::hasProperty(const OUString& Name, sal_Int32 Pr } Sequence< Property > ImplIntrospectionAccess::getProperties(sal_Int32 PropertyConcepts) - throw( RuntimeException, std::exception ) { // If all supported concepts are required, simply pass through the sequence sal_Int32 nAllSupportedMask = PROPERTYSET | @@ -1384,7 +1322,6 @@ Sequence< Property > ImplIntrospectionAccess::getProperties(sal_Int32 PropertyCo } Reference<XIdlMethod> ImplIntrospectionAccess::getMethod(const OUString& Name, sal_Int32 MethodConcepts) - throw( NoSuchMethodException, RuntimeException, std::exception ) { Reference<XIdlMethod> xRet; sal_Int32 i = mpStaticImpl->getMethodIndex( Name ); @@ -1403,7 +1340,6 @@ Reference<XIdlMethod> ImplIntrospectionAccess::getMethod(const OUString& Name, s } sal_Bool ImplIntrospectionAccess::hasMethod(const OUString& Name, sal_Int32 MethodConcepts) - throw( RuntimeException, std::exception ) { sal_Int32 i = mpStaticImpl->getMethodIndex( Name ); bool bRet = false; @@ -1417,7 +1353,6 @@ sal_Bool ImplIntrospectionAccess::hasMethod(const OUString& Name, sal_Int32 Meth } Sequence< Reference<XIdlMethod> > ImplIntrospectionAccess::getMethods(sal_Int32 MethodConcepts) - throw( RuntimeException, std::exception ) { // If all supported concepts are required, simply pass through the sequence sal_Int32 nAllSupportedMask = MethodConcept::DANGEROUS | @@ -1468,13 +1403,11 @@ Sequence< Reference<XIdlMethod> > ImplIntrospectionAccess::getMethods(sal_Int32 } Sequence< Type > ImplIntrospectionAccess::getSupportedListeners() - throw( RuntimeException, std::exception ) { return comphelper::containerToSequence(mpStaticImpl->getSupportedListeners()); } Reference<XInterface> SAL_CALL ImplIntrospectionAccess::queryAdapter( const Type& rType ) - throw( IllegalTypeException, RuntimeException, std::exception ) { Reference<XInterface> xRet; if( rType == cppu::UnoType<XInterface>::get() @@ -1498,13 +1431,13 @@ Reference<XInterface> SAL_CALL ImplIntrospectionAccess::queryAdapter( const Type } // Methods from XMaterialHolder -Any ImplIntrospectionAccess::getMaterial() throw(RuntimeException, std::exception) +Any ImplIntrospectionAccess::getMaterial() { return maInspectedObject; } // Methods from XExactName -OUString ImplIntrospectionAccess::getExactName( const OUString& rApproximateName ) throw( RuntimeException, std::exception ) +OUString ImplIntrospectionAccess::getExactName( const OUString& rApproximateName ) { OUString aRetStr; LowerToExactNameMap::iterator aIt = @@ -1622,25 +1555,21 @@ private: typeCache_.clear(); } - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.comp.stoc.Introspection"); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + getSupportedServiceNames() override { Sequence<OUString> s { "com.sun.star.beans.Introspection" }; return s; } virtual css::uno::Reference<css::beans::XIntrospectionAccess> SAL_CALL - inspect(css::uno::Any const & aObject) - throw (css::uno::RuntimeException, std::exception) override; + inspect(css::uno::Any const & aObject) override; css::uno::Reference<css::reflection::XIdlReflection> reflection_; Cache<TypeKey, TypeKeyLess> typeCache_; @@ -1648,7 +1577,6 @@ private: css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect( css::uno::Any const & aObject) - throw (css::uno::RuntimeException, std::exception) { css::uno::Reference<css::reflection::XIdlReflection> reflection; { diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 933ed5b556f3..6622441a8cd3 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -101,100 +101,84 @@ public: const Reference<XIdlReflection> & ); // XInterface - virtual Any SAL_CALL queryInterface( const Type & aType) throw( RuntimeException, std::exception ) override; + virtual Any SAL_CALL queryInterface( const Type & aType) override; virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } virtual void SAL_CALL release() throw() override { OWeakObject::release(); } // XTypeProvider - virtual Sequence< css::uno::Type > SAL_CALL getTypes( ) - throw(RuntimeException, std::exception) override; - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) - throw( RuntimeException, std::exception) override; + virtual Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XMaterialHolder - virtual Any SAL_CALL getMaterial() throw(RuntimeException, std::exception) override; + virtual Any SAL_CALL getMaterial() override; // XInvocation - virtual Reference<XIntrospectionAccess> SAL_CALL getIntrospection() throw( RuntimeException, std::exception ) override; - virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) - throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) override; - virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) - throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) override; - virtual Any SAL_CALL getValue(const OUString& PropertyName) - throw( UnknownPropertyException, RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ) override; + virtual Reference<XIntrospectionAccess> SAL_CALL getIntrospection() override; + virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) override; + virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) override; + virtual Any SAL_CALL getValue(const OUString& PropertyName) override; + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) override; + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) override; // XInvocation2 - virtual Sequence< OUString > SAL_CALL getMemberNames( ) - throw( RuntimeException, std::exception ) override; - virtual Sequence< InvocationInfo > SAL_CALL getInfo( ) - throw( RuntimeException, std::exception ) override; - virtual InvocationInfo SAL_CALL getInfoForName( const OUString& aName, sal_Bool bExact ) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; + virtual Sequence< OUString > SAL_CALL getMemberNames( ) override; + virtual Sequence< InvocationInfo > SAL_CALL getInfo( ) override; + virtual InvocationInfo SAL_CALL getInfoForName( const OUString& aName, sal_Bool bExact ) override; // All Access and Container methods are not thread safe // XElementAccess - virtual Type SAL_CALL getElementType() throw( RuntimeException, std::exception ) override + virtual Type SAL_CALL getElementType() override { return _xElementAccess->getElementType(); } - virtual sal_Bool SAL_CALL hasElements() throw( RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasElements() override { return _xElementAccess->hasElements(); } // XNameContainer - virtual void SAL_CALL insertByName( const OUString& Name, const Any& Element ) - throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception ) override + virtual void SAL_CALL insertByName( const OUString& Name, const Any& Element ) override { _xNameContainer->insertByName( Name, Element ); } - virtual void SAL_CALL removeByName( const OUString& Name ) - throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override + virtual void SAL_CALL removeByName( const OUString& Name ) override { _xNameContainer->removeByName( Name ); } // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& Name, const Any& Element ) - throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override + virtual void SAL_CALL replaceByName( const OUString& Name, const Any& Element ) override { _xNameReplace->replaceByName( Name, Element ); } // XNameAccess - virtual Any SAL_CALL getByName( const OUString& Name ) - throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override + virtual Any SAL_CALL getByName( const OUString& Name ) override { return _xNameAccess->getByName( Name ); } - virtual Sequence<OUString> SAL_CALL getElementNames() throw( RuntimeException, std::exception ) override + virtual Sequence<OUString> SAL_CALL getElementNames() override { return _xNameAccess->getElementNames(); } - virtual sal_Bool SAL_CALL hasByName( const OUString& Name ) throw( RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasByName( const OUString& Name ) override { return _xNameAccess->hasByName( Name ); } // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const Any& Element ) - throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const Any& Element ) override { _xIndexContainer->insertByIndex( Index, Element ); } - virtual void SAL_CALL removeByIndex( sal_Int32 Index ) - throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override + virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override { _xIndexContainer->removeByIndex( Index ); } // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any& Element ) - throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any& Element ) override { _xIndexReplace->replaceByIndex( Index, Element ); } // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( RuntimeException, std::exception ) override + virtual sal_Int32 SAL_CALL getCount() override { return _xIndexAccess->getCount(); } - virtual Any SAL_CALL getByIndex( sal_Int32 Index ) - throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override + virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override { return _xIndexAccess->getByIndex( Index ); } // XEnumerationAccess - virtual Reference<XEnumeration> SAL_CALL createEnumeration() throw( RuntimeException, std::exception ) override + virtual Reference<XEnumeration> SAL_CALL createEnumeration() override { return _xEnumerationAccess->createEnumeration(); } // XExactName - virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) throw( RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) override; private: @@ -249,7 +233,6 @@ Invocation_Impl::Invocation_Impl Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType ) - throw( RuntimeException, std::exception ) { // PropertySet implementation Any a = ::cppu::queryInterface( aType, @@ -329,7 +312,7 @@ Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType ) } -Any Invocation_Impl::getMaterial() throw(RuntimeException, std::exception) +Any Invocation_Impl::getMaterial() { // AB, 12.2.1999 Make sure that the material is taken when possible // from the direct Invocation of the Introspection, otherwise structs @@ -453,7 +436,6 @@ void Invocation_Impl::setMaterial( const Any& rMaterial ) OUString Invocation_Impl::getExactName( const OUString& rApproximateName ) - throw( RuntimeException, std::exception ) { if (_xENDirect.is()) return _xENDirect->getExactName( rApproximateName ); @@ -466,7 +448,6 @@ OUString Invocation_Impl::getExactName( const OUString& rApproximateName ) Reference<XIntrospectionAccess> Invocation_Impl::getIntrospection() - throw( RuntimeException, std::exception ) { if( _xDirect.is() ) return _xDirect->getIntrospection(); @@ -476,7 +457,6 @@ Reference<XIntrospectionAccess> Invocation_Impl::getIntrospection() sal_Bool Invocation_Impl::hasMethod( const OUString& Name ) - throw( RuntimeException, std::exception ) { if (_xDirect.is()) return _xDirect->hasMethod( Name ); @@ -487,7 +467,6 @@ sal_Bool Invocation_Impl::hasMethod( const OUString& Name ) sal_Bool Invocation_Impl::hasProperty( const OUString& Name ) - throw( RuntimeException, std::exception ) { if (_xDirect.is()) return _xDirect->hasProperty( Name ); @@ -503,7 +482,6 @@ sal_Bool Invocation_Impl::hasProperty( const OUString& Name ) Any Invocation_Impl::getValue( const OUString& PropertyName ) - throw( UnknownPropertyException, RuntimeException, std::exception ) { if (_xDirect.is()) return _xDirect->getValue( PropertyName ); @@ -537,7 +515,6 @@ Any Invocation_Impl::getValue( const OUString& PropertyName ) void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value ) - throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) { if (_xDirect.is()) _xDirect->setValue( PropertyName, Value ); @@ -613,7 +590,6 @@ void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value ) Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>& InParams, Sequence<sal_Int16>& OutIndices, Sequence<Any>& OutParams ) - throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) { if (_xDirect.is()) return _xDirect->invoke( FunctionName, InParams, OutIndices, OutParams ); @@ -847,7 +823,6 @@ void Invocation_Impl::getInfoSequenceImpl // XInvocation2 Sequence< OUString > SAL_CALL Invocation_Impl::getMemberNames( ) - throw( RuntimeException, std::exception ) { if( _xDirect2.is() ) { @@ -859,7 +834,6 @@ Sequence< OUString > SAL_CALL Invocation_Impl::getMemberNames( ) } Sequence< InvocationInfo > SAL_CALL Invocation_Impl::getInfo( ) - throw( RuntimeException, std::exception ) { if( _xDirect2.is() ) { @@ -871,7 +845,6 @@ Sequence< InvocationInfo > SAL_CALL Invocation_Impl::getInfo( ) } InvocationInfo SAL_CALL Invocation_Impl::getInfoForName( const OUString& aName, sal_Bool bExact ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { if( _xDirect2.is() ) { @@ -983,7 +956,7 @@ void Invocation_Impl::fillInfoForMethod // XTypeProvider -Sequence< Type > SAL_CALL Invocation_Impl::getTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL Invocation_Impl::getTypes() { static Sequence< Type > const * s_pTypes = nullptr; if (! s_pTypes) @@ -1057,7 +1030,7 @@ Sequence< Type > SAL_CALL Invocation_Impl::getTypes() throw( RuntimeException, s return *s_pTypes; } -Sequence< sal_Int8 > SAL_CALL Invocation_Impl::getImplementationId( ) throw( RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL Invocation_Impl::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -1070,14 +1043,14 @@ public: explicit InvocationService( const Reference<XComponentContext> & xCtx ); // XServiceInfo - OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override; - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) override; - Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) override; + OUString SAL_CALL getImplementationName() override; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XSingleServiceFactory - Reference<XInterface> SAL_CALL createInstance() throw( Exception, RuntimeException, std::exception ) override; + Reference<XInterface> SAL_CALL createInstance() override; Reference<XInterface> SAL_CALL createInstanceWithArguments( - const Sequence<Any>& rArguments ) throw( Exception, RuntimeException, std::exception ) override; + const Sequence<Any>& rArguments ) override; private: Reference<XComponentContext> mxCtx; Reference<XMultiComponentFactory> mxSMgr; @@ -1098,25 +1071,25 @@ InvocationService::InvocationService( const Reference<XComponentContext> & xCtx } // XServiceInfo -OUString InvocationService::getImplementationName() throw( RuntimeException, std::exception ) +OUString InvocationService::getImplementationName() { return inv_getImplementationName(); } // XServiceInfo -sal_Bool InvocationService::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) +sal_Bool InvocationService::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } // XServiceInfo -Sequence< OUString > InvocationService::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > InvocationService::getSupportedServiceNames() { return inv_getSupportedServiceNames(); } -Reference<XInterface> InvocationService::createInstance() throw( Exception, RuntimeException, std::exception ) +Reference<XInterface> InvocationService::createInstance() { //TODO:throw( Exception("no default construction of invocation adapter possible!", *this) ); return Reference<XInterface>(); // dummy @@ -1124,7 +1097,7 @@ Reference<XInterface> InvocationService::createInstance() throw( Exception, Runt Reference<XInterface> InvocationService::createInstanceWithArguments( - const Sequence<Any>& rArguments ) throw( Exception, RuntimeException, std::exception ) + const Sequence<Any>& rArguments ) { if (rArguments.getLength() == 1) { @@ -1141,7 +1114,6 @@ Reference<XInterface> InvocationService::createInstanceWithArguments( /// @throws RuntimeException Reference<XInterface> SAL_CALL InvocationService_CreateInstance( const Reference<XComponentContext> & xCtx ) - throw( RuntimeException ) { Reference<XInterface> xService( *new InvocationService( xCtx ) ); return xService; diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index d9369716762d..ed9977ffba45 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -103,22 +103,17 @@ public: virtual ~FactoryImpl() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) - throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XInvocationAdapterFactory virtual Reference< XInterface > SAL_CALL createAdapter( - const Reference< script::XInvocation > & xReceiver, const Type & rType ) - throw (RuntimeException, std::exception) override; + const Reference< script::XInvocation > & xReceiver, const Type & rType ) override; // XInvocationAdapterFactory2 virtual Reference< XInterface > SAL_CALL createAdapter( const Reference< script::XInvocation > & xReceiver, - const Sequence< Type > & rTypes ) - throw (RuntimeException, std::exception) override; + const Sequence< Type > & rTypes ) override; }; struct AdapterImpl; @@ -810,7 +805,6 @@ static inline AdapterImpl * lookup_adapter( Reference< XInterface > FactoryImpl::createAdapter( const Reference< script::XInvocation > & xReceiver, const Sequence< Type > & rTypes ) - throw (RuntimeException, std::exception) { Reference< XInterface > xRet; if (xReceiver.is() && rTypes.getLength()) @@ -869,7 +863,6 @@ Reference< XInterface > FactoryImpl::createAdapter( Reference< XInterface > FactoryImpl::createAdapter( const Reference< script::XInvocation > & xReceiver, const Type & rType ) - throw (RuntimeException, std::exception) { return createAdapter( xReceiver, Sequence< Type >( &rType, 1 ) ); } @@ -877,19 +870,16 @@ Reference< XInterface > FactoryImpl::createAdapter( // XServiceInfo OUString FactoryImpl::getImplementationName() - throw (RuntimeException, std::exception) { return invadp_getImplementationName(); } sal_Bool FactoryImpl::supportsService( const OUString & rServiceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > FactoryImpl::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return invadp_getSupportedServiceNames(); } @@ -897,7 +887,6 @@ Sequence< OUString > FactoryImpl::getSupportedServiceNames() /// @throws Exception static Reference< XInterface > SAL_CALL FactoryImpl_create( const Reference< XComponentContext > & xContext ) - throw (Exception) { return static_cast<cppu::OWeakObject *>(new FactoryImpl( xContext )); } diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 9a093853c05e..5b421b0ba253 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -101,26 +101,21 @@ class JavaComponentLoader : public WeakImplHelper<XImplementationLoader, XServic public: /// @throws RuntimeException - explicit JavaComponentLoader(const css::uno::Reference<XComponentContext> & xCtx) - throw(RuntimeException); + explicit JavaComponentLoader(const css::uno::Reference<XComponentContext> & xCtx); public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(RuntimeException, std::exception) override; - virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XImplementationLoader virtual css::uno::Reference<XInterface> SAL_CALL activate( const OUString& implementationName, const OUString& implementationLoaderUrl, - const OUString& locationUrl, const css::uno::Reference<XRegistryKey>& xKey) - throw(CannotActivateFactoryException, RuntimeException, std::exception) override; + const OUString& locationUrl, const css::uno::Reference<XRegistryKey>& xKey) override; virtual sal_Bool SAL_CALL writeRegistryInfo( const css::uno::Reference<XRegistryKey>& xKey, - const OUString& implementationLoaderUrl, const OUString& locationUrl) - throw(CannotRegisterImplementationException, RuntimeException, std::exception) override; + const OUString& implementationLoaderUrl, const OUString& locationUrl) override; }; const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaLoader() @@ -289,7 +284,7 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL return m_javaLoader; } -JavaComponentLoader::JavaComponentLoader(const css::uno::Reference<XComponentContext> & xCtx) throw(RuntimeException) : +JavaComponentLoader::JavaComponentLoader(const css::uno::Reference<XComponentContext> & xCtx) : m_xComponentContext(xCtx) { @@ -298,19 +293,16 @@ JavaComponentLoader::JavaComponentLoader(const css::uno::Reference<XComponentCon // XServiceInfo OUString SAL_CALL JavaComponentLoader::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return loader_getImplementationName(); } sal_Bool SAL_CALL JavaComponentLoader::supportsService(const OUString & ServiceName) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence<OUString> SAL_CALL JavaComponentLoader::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { return loader_getSupportedServiceNames(); } @@ -320,7 +312,6 @@ Sequence<OUString> SAL_CALL JavaComponentLoader::getSupportedServiceNames() sal_Bool SAL_CALL JavaComponentLoader::writeRegistryInfo( const css::uno::Reference<XRegistryKey> & xKey, const OUString & blabla, const OUString & rLibName) - throw(CannotRegisterImplementationException, RuntimeException, std::exception) { const css::uno::Reference<XImplementationLoader> & loader = getJavaLoader(); if (loader.is()) @@ -333,7 +324,6 @@ sal_Bool SAL_CALL JavaComponentLoader::writeRegistryInfo( css::uno::Reference<XInterface> SAL_CALL JavaComponentLoader::activate( const OUString & rImplName, const OUString & blabla, const OUString & rLibName, const css::uno::Reference<XRegistryKey> & xKey) - throw(CannotActivateFactoryException, RuntimeException, std::exception) { const css::uno::Reference<XImplementationLoader> & loader = getJavaLoader(); if (loader.is()) @@ -358,7 +348,7 @@ static Mutex & getInitMutex() } /// @throws Exception -css::uno::Reference<XInterface> SAL_CALL JavaComponentLoader_CreateInstance(const css::uno::Reference<XComponentContext> & xCtx) throw(Exception) +css::uno::Reference<XInterface> SAL_CALL JavaComponentLoader_CreateInstance(const css::uno::Reference<XComponentContext> & xCtx) { css::uno::Reference<XInterface> xRet; diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx index 5e20d3d603c5..081dce9b1e72 100644 --- a/stoc/source/javavm/interact.cxx +++ b/stoc/source/javavm/interact.cxx @@ -40,7 +40,7 @@ public: AbortContinuation(const AbortContinuation&) = delete; AbortContinuation& operator=(const AbortContinuation&)= delete; - virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL select() override {} private: virtual inline ~AbortContinuation() override {} @@ -56,7 +56,7 @@ public: RetryContinuation(const RetryContinuation&) = delete; RetryContinuation& operator=(const RetryContinuation&) = delete; - virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL select() override; bool isSelected() const; @@ -68,7 +68,6 @@ private: }; void SAL_CALL InteractionRequest::RetryContinuation::select() - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); m_bSelected = true; @@ -90,14 +89,12 @@ InteractionRequest::InteractionRequest(css::uno::Any const & rRequest): } css::uno::Any SAL_CALL InteractionRequest::getRequest() - throw (css::uno::RuntimeException, std::exception) { return m_aRequest; } css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL InteractionRequest::getContinuations() - throw (css::uno::RuntimeException, std::exception) { return m_aContinuations; } diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx index 8977b4449416..67a506769327 100644 --- a/stoc/source/javavm/interact.hxx +++ b/stoc/source/javavm/interact.hxx @@ -39,12 +39,11 @@ class InteractionRequest: public: explicit InteractionRequest(css::uno::Any const & rRequest); - virtual css::uno::Any SAL_CALL getRequest() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getRequest() override; virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL - getContinuations() throw (css::uno::RuntimeException, std::exception) override; + getContinuations() override; bool retry() const; diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 907fd12bd7ea..8627f8583d6c 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -131,8 +131,7 @@ private: SingletonFactory(const SingletonFactory&) = delete; SingletonFactory& operator=(const SingletonFactory&) = delete; - virtual void SAL_CALL disposing(css::lang::EventObject const &) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(css::lang::EventObject const &) override; static void dispose(); @@ -173,7 +172,6 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::getSingleton( } void SAL_CALL SingletonFactory::disposing(css::lang::EventObject const &) - throw (css::uno::RuntimeException, std::exception) { dispose(); } @@ -268,7 +266,7 @@ bool askForRetry(css::uno::Any const & rException) /// @throws css::uno::Exception void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, const css::uno::Reference<css::lang::XMultiComponentFactory> & xSMgr, - const css::uno::Reference<css::uno::XComponentContext> &xCtx ) throw (css::uno::Exception) + const css::uno::Reference<css::uno::XComponentContext> &xCtx ) { css::uno::Reference<css::uno::XInterface> xConfRegistry = xSMgr->createInstanceWithContext( "com.sun.star.configuration.ConfigurationRegistry", @@ -351,7 +349,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, void getDefaultLocaleFromConfig( stoc_javavm::JVM * pjvm, const css::uno::Reference<css::lang::XMultiComponentFactory> & xSMgr, - const css::uno::Reference<css::uno::XComponentContext> &xCtx ) throw(css::uno::Exception, std::exception) + const css::uno::Reference<css::uno::XComponentContext> &xCtx ) { css::uno::Reference<css::uno::XInterface> xConfRegistry = xSMgr->createInstanceWithContext( "com.sun.star.configuration.ConfigurationRegistry", xCtx ); @@ -455,7 +453,7 @@ void getDefaultLocaleFromConfig( void getJavaPropsFromSafetySettings( stoc_javavm::JVM * pjvm, const css::uno::Reference<css::lang::XMultiComponentFactory> & xSMgr, - const css::uno::Reference<css::uno::XComponentContext> &xCtx) throw(css::uno::Exception) + const css::uno::Reference<css::uno::XComponentContext> &xCtx) { css::uno::Reference<css::uno::XInterface> xConfRegistry = xSMgr->createInstanceWithContext( @@ -542,7 +540,7 @@ void setTimeZone(stoc_javavm::JVM * pjvm) throw() { void initVMConfiguration( stoc_javavm::JVM * pjvm, const css::uno::Reference<css::lang::XMultiComponentFactory> & xSMgr, - const css::uno::Reference<css::uno::XComponentContext > &xCtx) throw(css::uno::Exception, std::exception) + const css::uno::Reference<css::uno::XComponentContext > &xCtx) { stoc_javavm::JVM jvm; try { @@ -619,7 +617,6 @@ JavaVirtualMachine::JavaVirtualMachine( void SAL_CALL JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const & rArguments) - throw (css::uno::Exception, std::exception) { osl::MutexGuard aGuard(m_aMutex); if (m_bDisposed) @@ -674,28 +671,24 @@ JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const & } OUString SAL_CALL JavaVirtualMachine::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return serviceGetImplementationName(); } sal_Bool SAL_CALL JavaVirtualMachine::supportsService(OUString const & rServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL JavaVirtualMachine::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return serviceGetSupportedServiceNames(); } css::uno::Any SAL_CALL JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); if (m_bDisposed) @@ -935,7 +928,6 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) } sal_Bool SAL_CALL JavaVirtualMachine::isVMStarted() - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); if (m_bDisposed) @@ -945,7 +937,6 @@ sal_Bool SAL_CALL JavaVirtualMachine::isVMStarted() } sal_Bool SAL_CALL JavaVirtualMachine::isVMEnabled() - throw (css::uno::RuntimeException, std::exception) { { osl::MutexGuard aGuard(m_aMutex); @@ -964,7 +955,6 @@ sal_Bool SAL_CALL JavaVirtualMachine::isVMEnabled() } sal_Bool SAL_CALL JavaVirtualMachine::isThreadAttached() - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); if (m_bDisposed) @@ -978,7 +968,6 @@ sal_Bool SAL_CALL JavaVirtualMachine::isThreadAttached() } void SAL_CALL JavaVirtualMachine::registerThread() - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); if (m_bDisposed) @@ -1011,7 +1000,6 @@ void SAL_CALL JavaVirtualMachine::registerThread() } void SAL_CALL JavaVirtualMachine::revokeThread() - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); if (m_bDisposed) @@ -1033,7 +1021,6 @@ void SAL_CALL JavaVirtualMachine::revokeThread() void SAL_CALL JavaVirtualMachine::disposing(css::lang::EventObject const & rSource) - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); if (rSource.Source == m_xInetConfiguration) @@ -1044,12 +1031,10 @@ JavaVirtualMachine::disposing(css::lang::EventObject const & rSource) void SAL_CALL JavaVirtualMachine::elementInserted( css::container::ContainerEvent const &) - throw (css::uno::RuntimeException, std::exception) {} void SAL_CALL JavaVirtualMachine::elementRemoved( css::container::ContainerEvent const &) - throw (css::uno::RuntimeException, std::exception) {} // If a user changes the setting, for example for proxy settings, then this @@ -1059,7 +1044,6 @@ void SAL_CALL JavaVirtualMachine::elementRemoved( // values. void SAL_CALL JavaVirtualMachine::elementReplaced( css::container::ContainerEvent const & rEvent) - throw (css::uno::RuntimeException, std::exception) { // TODO Using the new value stored in rEvent is wrong here. If two threads // receive different elementReplaced calls in quick succession, it is diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx index f4ebabd48f7f..a8883f1ddffb 100644 --- a/stoc/source/javavm/javavm.hxx +++ b/stoc/source/javavm/javavm.hxx @@ -66,57 +66,44 @@ public: // XInitialization virtual void SAL_CALL initialize(css::uno::Sequence< css::uno::Any > const & - rArguments) - throw (css::uno::Exception, std::exception) override; + rArguments) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService(OUString const & rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + supportsService(OUString const & rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XJavaVM virtual css::uno::Any SAL_CALL - getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) - throw (css::uno::RuntimeException, std::exception) override; + getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) override; - virtual sal_Bool SAL_CALL isVMStarted() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isVMStarted() override; - virtual sal_Bool SAL_CALL isVMEnabled() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isVMEnabled() override; // XJavaThreadRegister_11 - virtual sal_Bool SAL_CALL isThreadAttached() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isThreadAttached() override; - virtual void SAL_CALL registerThread() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL registerThread() override; - virtual void SAL_CALL revokeThread() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL revokeThread() override; // XContainerListener virtual void SAL_CALL - disposing(css::lang::EventObject const & rSource) - throw (css::uno::RuntimeException, std::exception) override; + disposing(css::lang::EventObject const & rSource) override; virtual void SAL_CALL - elementInserted(css::container::ContainerEvent const & rEvent) - throw (css::uno::RuntimeException, std::exception) override; + elementInserted(css::container::ContainerEvent const & rEvent) override; virtual void SAL_CALL - elementRemoved(css::container::ContainerEvent const & rEvent) - throw (css::uno::RuntimeException, std::exception) override; + elementRemoved(css::container::ContainerEvent const & rEvent) override; virtual void SAL_CALL - elementReplaced(css::container::ContainerEvent const & rEvent) - throw (css::uno::RuntimeException, std::exception) override; + elementReplaced(css::container::ContainerEvent const & rEvent) override; private: JavaVirtualMachine(JavaVirtualMachine &) = delete; diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index 8b765f41515e..4f9cc2c6a1b4 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -61,16 +61,16 @@ public: explicit DllComponentLoader( const Reference<XComponentContext> & xCtx ); // 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 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 Sequence< OUString > SAL_CALL getSupportedServiceNames( ) 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; // XImplementationLoader - virtual Reference<XInterface> SAL_CALL activate( const OUString& implementationName, const OUString& implementationLoaderUrl, const OUString& locationUrl, const Reference<XRegistryKey>& xKey ) throw(CannotActivateFactoryException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL writeRegistryInfo( const Reference<XRegistryKey>& xKey, const OUString& implementationLoaderUrl, const OUString& locationUrl ) throw(CannotRegisterImplementationException, RuntimeException, std::exception) override; + virtual Reference<XInterface> SAL_CALL activate( const OUString& implementationName, const OUString& implementationLoaderUrl, const OUString& locationUrl, const Reference<XRegistryKey>& xKey ) override; + virtual sal_Bool SAL_CALL writeRegistryInfo( const Reference<XRegistryKey>& xKey, const OUString& implementationLoaderUrl, const OUString& locationUrl ) override; private: Reference<XMultiServiceFactory> m_xSMgr; @@ -83,19 +83,16 @@ DllComponentLoader::DllComponentLoader( const Reference<XComponentContext> & xCt } OUString SAL_CALL DllComponentLoader::getImplementationName( ) - throw(css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.stoc.DLLComponentLoader"); } sal_Bool SAL_CALL DllComponentLoader::supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence<OUString> SAL_CALL DllComponentLoader::getSupportedServiceNames( ) - throw(css::uno::RuntimeException, std::exception) { Sequence< OUString > seqNames { "com.sun.star.loader.SharedLibrary" }; return seqNames; @@ -103,7 +100,6 @@ Sequence<OUString> SAL_CALL DllComponentLoader::getSupportedServiceNames( ) void DllComponentLoader::initialize( const css::uno::Sequence< css::uno::Any >& ) - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) { OSL_FAIL( "dllcomponentloader::initialize should not be called !" ); // if( aArgs.getLength() != 1 ) @@ -130,8 +126,6 @@ void DllComponentLoader::initialize( const css::uno::Sequence< css::uno::Any >& Reference<XInterface> SAL_CALL DllComponentLoader::activate( const OUString & rImplName, const OUString &, const OUString & rLibName, const Reference< XRegistryKey > & ) - - throw(CannotActivateFactoryException, RuntimeException, std::exception) { return loadSharedLibComponentFactory( cppu::bootstrap_expandUri(rLibName), OUString(), rImplName, m_xSMgr, @@ -141,8 +135,6 @@ Reference<XInterface> SAL_CALL DllComponentLoader::activate( sal_Bool SAL_CALL DllComponentLoader::writeRegistryInfo( const Reference< XRegistryKey > & xKey, const OUString &, const OUString & rLibName ) - - throw(CannotRegisterImplementationException, RuntimeException, std::exception) { #ifdef DISABLE_DYNLOADING (void) xKey; diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index 8e3fda8c8f57..f5b852553ddc 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -78,16 +78,13 @@ public: NamingService_Impl(); // 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 Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) throw(Exception, RuntimeException, std::exception) override; - virtual void SAL_CALL registerObject( const OUString& Name, const css::uno::Reference< css::uno::XInterface >& Object ) throw(Exception, RuntimeException, std::exception) override; - virtual void SAL_CALL revokeObject( const OUString& Name ) throw(Exception, RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) override; + virtual void SAL_CALL registerObject( const OUString& Name, const css::uno::Reference< css::uno::XInterface >& Object ) override; + virtual void SAL_CALL revokeObject( const OUString& Name ) override; }; @@ -102,27 +99,24 @@ NamingService_Impl::NamingService_Impl() {} // XServiceInfo OUString NamingService_Impl::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return ns_getImplementationName(); } // XServiceInfo sal_Bool NamingService_Impl::supportsService( const OUString & rServiceName ) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } // XServiceInfo Sequence< OUString > NamingService_Impl::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { return ns_getSupportedServiceNames(); } // XServiceInfo -Reference< XInterface > NamingService_Impl::getRegisteredObject( const OUString& Name ) throw(Exception, RuntimeException, std::exception) +Reference< XInterface > NamingService_Impl::getRegisteredObject( const OUString& Name ) { Guard< Mutex > aGuard( aMutex ); Reference< XInterface > xRet; @@ -133,14 +127,14 @@ Reference< XInterface > NamingService_Impl::getRegisteredObject( const OUString& } // XServiceInfo -void NamingService_Impl::registerObject( const OUString& Name, const Reference< XInterface >& Object ) throw(Exception, RuntimeException, std::exception) +void NamingService_Impl::registerObject( const OUString& Name, const Reference< XInterface >& Object ) { Guard< Mutex > aGuard( aMutex ); aMap[ Name ] = Object; } // XServiceInfo -void NamingService_Impl::revokeObject( const OUString& Name ) throw(Exception, RuntimeException, std::exception) +void NamingService_Impl::revokeObject( const OUString& Name ) { Guard< Mutex > aGuard( aMutex ); aMap.erase( Name ); diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index a701e7b02478..ea3c7479c21d 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -77,17 +77,13 @@ struct FactoryImpl : public ::cppu::WeakImplHelper< lang::XServiceInfo, FactoryImpl(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) - throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XProxyFactory virtual Reference< XAggregation > SAL_CALL createProxy( - Reference< XInterface > const & xTarget ) - throw (RuntimeException, std::exception) override; + Reference< XInterface > const & xTarget ) override; }; @@ -165,8 +161,7 @@ UnoInterfaceReference FactoryImpl::binuno_queryInterface( struct ProxyRoot : public ::cppu::OWeakAggObject { // XAggregation - virtual Any SAL_CALL queryAggregation( Type const & rType ) - throw (RuntimeException, std::exception) override; + virtual Any SAL_CALL queryAggregation( Type const & rType ) override; inline ProxyRoot( ::rtl::Reference< FactoryImpl > const & factory, Reference< XInterface > const & xTarget ); @@ -314,7 +309,6 @@ inline ProxyRoot::ProxyRoot( Any ProxyRoot::queryAggregation( Type const & rType ) - throw (RuntimeException, std::exception) { Any ret( OWeakAggObject::queryAggregation( rType ) ); if (! ret.hasValue()) @@ -413,7 +407,6 @@ FactoryImpl::FactoryImpl() Reference< XAggregation > FactoryImpl::createProxy( Reference< XInterface > const & xTarget ) - throw (RuntimeException, std::exception) { return new ProxyRoot( this, xTarget ); } @@ -421,19 +414,16 @@ Reference< XAggregation > FactoryImpl::createProxy( // XServiceInfo OUString FactoryImpl::getImplementationName() - throw (RuntimeException, std::exception) { return proxyfac_getImplementationName(); } sal_Bool FactoryImpl::supportsService( const OUString & rServiceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > FactoryImpl::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { return proxyfac_getSupportedServiceNames(); } @@ -441,7 +431,6 @@ Sequence< OUString > FactoryImpl::getSupportedServiceNames() /// @throws Exception Reference< XInterface > SAL_CALL proxyfac_create( SAL_UNUSED_PARAMETER Reference< XComponentContext > const & ) - throw (Exception) { Reference< XInterface > xRet; { diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 1bc162ab703a..193c98482569 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -85,8 +85,7 @@ public: // XAccessControlContext impl virtual void SAL_CALL checkPermission( - Any const & perm ) - throw (RuntimeException, std::exception) override; + Any const & perm ) override; }; inline acc_Intersection::acc_Intersection( @@ -109,7 +108,6 @@ inline Reference< security::XAccessControlContext > acc_Intersection::create( void acc_Intersection::checkPermission( Any const & perm ) - throw (RuntimeException, std::exception) { m_x1->checkPermission( perm ); m_x2->checkPermission( perm ); @@ -133,8 +131,7 @@ public: // XAccessControlContext impl virtual void SAL_CALL checkPermission( - Any const & perm ) - throw (RuntimeException, std::exception) override; + Any const & perm ) override; }; inline acc_Union::acc_Union( @@ -157,7 +154,6 @@ inline Reference< security::XAccessControlContext > acc_Union::create( void acc_Union::checkPermission( Any const & perm ) - throw (RuntimeException, std::exception) { try { @@ -184,13 +180,11 @@ public: // XAccessControlContext impl virtual void SAL_CALL checkPermission( - Any const & perm ) - throw (RuntimeException, std::exception) override; + Any const & perm ) override; }; void acc_Policy::checkPermission( Any const & perm ) - throw (RuntimeException, std::exception) { m_permissions.checkPermission( perm ); } @@ -209,8 +203,7 @@ public: Reference< security::XAccessControlContext > const & xRestriction ); // XCurrentContext impl - virtual Any SAL_CALL getValueByName( OUString const & name ) - throw (RuntimeException, std::exception) override; + virtual Any SAL_CALL getValueByName( OUString const & name ) override; }; inline acc_CurrentContext::acc_CurrentContext( @@ -226,7 +219,6 @@ inline acc_CurrentContext::acc_CurrentContext( } Any acc_CurrentContext::getValueByName( OUString const & name ) - throw (RuntimeException, std::exception) { if (name == s_acRestriction) { @@ -326,31 +318,23 @@ public: // XInitialization impl virtual void SAL_CALL initialize( - Sequence< Any > const & arguments ) - throw (Exception, std::exception) override; + Sequence< Any > const & arguments ) override; // XAccessController impl virtual void SAL_CALL checkPermission( - Any const & perm ) - throw (RuntimeException, std::exception) override; + Any const & perm ) override; virtual Any SAL_CALL doRestricted( Reference< security::XAction > const & xAction, - Reference< security::XAccessControlContext > const & xRestriction ) - throw (Exception, std::exception) override; + Reference< security::XAccessControlContext > const & xRestriction ) override; virtual Any SAL_CALL doPrivileged( Reference< security::XAction > const & xAction, - Reference< security::XAccessControlContext > const & xRestriction ) - throw (Exception, std::exception) override; - virtual Reference< security::XAccessControlContext > SAL_CALL getContext() - throw (RuntimeException, std::exception) override; + Reference< security::XAccessControlContext > const & xRestriction ) override; + virtual Reference< security::XAccessControlContext > SAL_CALL getContext() override; // XServiceInfo impl - virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) - throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; AccessController::AccessController( Reference< XComponentContext > const & xComponentContext ) @@ -426,7 +410,6 @@ void AccessController::disposing() void AccessController::initialize( Sequence< Any > const & arguments ) - throw (Exception, std::exception) { // xxx todo: review for forking // portal forking hack: re-initialize for another user-id @@ -748,7 +731,6 @@ PermissionCollection AccessController::getEffectivePermissions( void AccessController::checkPermission( Any const & perm ) - throw (RuntimeException, std::exception) { if (rBHelper.bDisposed) { @@ -778,7 +760,6 @@ void AccessController::checkPermission( Any AccessController::doRestricted( Reference< security::XAction > const & xAction, Reference< security::XAccessControlContext > const & xRestriction ) - throw (Exception, std::exception) { if (rBHelper.bDisposed) { @@ -811,7 +792,6 @@ Any AccessController::doRestricted( Any AccessController::doPrivileged( Reference< security::XAction > const & xAction, Reference< security::XAccessControlContext > const & xRestriction ) - throw (Exception, std::exception) { if (rBHelper.bDisposed) { @@ -846,7 +826,6 @@ Any AccessController::doPrivileged( } Reference< security::XAccessControlContext > AccessController::getContext() - throw (RuntimeException, std::exception) { if (rBHelper.bDisposed) { @@ -870,19 +849,16 @@ Reference< security::XAccessControlContext > AccessController::getContext() // XServiceInfo impl OUString AccessController::getImplementationName() - throw (RuntimeException, std::exception) { return OUString("com.sun.star.security.comp.stoc.AccessController"); } sal_Bool AccessController::supportsService( OUString const & serviceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } Sequence< OUString > AccessController::getSupportedServiceNames() - throw (RuntimeException, std::exception) { Sequence<OUString> aSNS { SERVICE_NAME }; return aSNS; diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index bc3f3fe0e0be..6fada62ca405 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -75,20 +75,14 @@ public: // XPolicy impl virtual Sequence< Any > SAL_CALL getPermissions( - OUString const & userId ) - throw (RuntimeException, std::exception) override; - virtual Sequence< Any > SAL_CALL getDefaultPermissions() - throw (RuntimeException, std::exception) override; - virtual void SAL_CALL refresh() - throw (RuntimeException, std::exception) override; + OUString const & userId ) override; + virtual Sequence< Any > SAL_CALL getDefaultPermissions() override; + virtual void SAL_CALL refresh() override; // XServiceInfo impl - virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) - throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; FilePolicy::FilePolicy( Reference< XComponentContext > const & xComponentContext ) @@ -108,7 +102,6 @@ void FilePolicy::disposing() Sequence< Any > FilePolicy::getPermissions( OUString const & userId ) - throw (RuntimeException, std::exception) { if (! m_init) { @@ -129,7 +122,6 @@ Sequence< Any > FilePolicy::getPermissions( } Sequence< Any > FilePolicy::getDefaultPermissions() - throw (RuntimeException, std::exception) { if (! m_init) { @@ -385,7 +377,6 @@ PolicyReader::~PolicyReader() void FilePolicy::refresh() - throw (RuntimeException, std::exception) { // read out file (the .../file-name value had originally been set in // cppu::add_access_control_entries (cppuhelper/source/servicefactory.cxx) @@ -491,19 +482,16 @@ void FilePolicy::refresh() OUString FilePolicy::getImplementationName() - throw (RuntimeException, std::exception) { return OUString(IMPL_NAME); } sal_Bool FilePolicy::supportsService( OUString const & serviceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } Sequence< OUString > FilePolicy::getSupportedServiceNames() - throw (RuntimeException, std::exception) { Sequence<OUString> aSNS { "com.sun.star.security.Policy" }; return aSNS; diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index f47b0b0b5923..8a6fb3bf9df5 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -163,10 +163,8 @@ public: {} // XEnumeration - sal_Bool SAL_CALL hasMoreElements() - throw(css::uno::RuntimeException, std::exception) override; - Any SAL_CALL nextElement() - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL hasMoreElements() override; + Any SAL_CALL nextElement() override; private: Mutex aMutex; Sequence< Reference<XInterface > > aFactories; @@ -174,7 +172,7 @@ private: }; // XEnumeration -sal_Bool ServiceEnumeration_Impl::hasMoreElements() throw(css::uno::RuntimeException, std::exception) +sal_Bool ServiceEnumeration_Impl::hasMoreElements() { MutexGuard aGuard( aMutex ); return nIt != aFactories.getLength(); @@ -182,7 +180,6 @@ sal_Bool ServiceEnumeration_Impl::hasMoreElements() throw(css::uno::RuntimeExcep // XEnumeration Any ServiceEnumeration_Impl::nextElement() - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { MutexGuard aGuard( aMutex ); if( nIt == aFactories.getLength() ) @@ -202,22 +199,17 @@ public: {} // XPropertySetInfo impl - virtual Sequence< beans::Property > SAL_CALL getProperties() - throw (RuntimeException, std::exception) override; - virtual beans::Property SAL_CALL getPropertyByName( OUString const & name ) - throw (beans::UnknownPropertyException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasPropertyByName( OUString const & name ) - throw (RuntimeException, std::exception) override; + virtual Sequence< beans::Property > SAL_CALL getProperties() override; + virtual beans::Property SAL_CALL getPropertyByName( OUString const & name ) override; + virtual sal_Bool SAL_CALL hasPropertyByName( OUString const & name ) override; }; Sequence< beans::Property > PropertySetInfo_Impl::getProperties() - throw (RuntimeException, std::exception) { return m_properties; } beans::Property PropertySetInfo_Impl::getPropertyByName( OUString const & name ) - throw (beans::UnknownPropertyException, RuntimeException, std::exception) { beans::Property const * p = m_properties.getConstArray(); for ( sal_Int32 nPos = m_properties.getLength(); nPos--; ) @@ -230,7 +222,6 @@ beans::Property PropertySetInfo_Impl::getPropertyByName( OUString const & name ) } sal_Bool PropertySetInfo_Impl::hasPropertyByName( OUString const & name ) - throw (RuntimeException, std::exception) { beans::Property const * p = m_properties.getConstArray(); for ( sal_Int32 nPos = m_properties.getLength(); nPos--; ) @@ -254,10 +245,8 @@ public: {} // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() - throw(css::uno::RuntimeException, std::exception) override; - virtual Any SAL_CALL nextElement() - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() override; + virtual Any SAL_CALL nextElement() override; private: Mutex aMutex; @@ -267,7 +256,6 @@ private: // XEnumeration sal_Bool ImplementationEnumeration_Impl::hasMoreElements() - throw(css::uno::RuntimeException, std::exception) { MutexGuard aGuard( aMutex ); return aIt != aImplementationMap.end(); @@ -275,7 +263,6 @@ sal_Bool ImplementationEnumeration_Impl::hasMoreElements() // XEnumeration Any ImplementationEnumeration_Impl::nextElement() - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { MutexGuard aGuard( aMutex ); if( aIt == aImplementationMap.end() ) @@ -323,11 +310,10 @@ public: {} // XEventListener - virtual void SAL_CALL disposing(const EventObject & rEvt ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const EventObject & rEvt ) override; }; void OServiceManager_Listener::disposing(const EventObject & rEvt ) - throw(css::uno::RuntimeException, std::exception) { Reference<XSet > x( xSMgr ); if( x.is() ) @@ -370,69 +356,59 @@ public: explicit OServiceManager( Reference< XComponentContext > const & xContext ); // XInitialization - void SAL_CALL initialize( Sequence< Any > const & args ) - throw (Exception, std::exception) override; + void SAL_CALL initialize( Sequence< Any > const & args ) 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 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 Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XMultiComponentFactory virtual Reference< XInterface > SAL_CALL createInstanceWithContext( - OUString const & rServiceSpecifier, Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) override; + OUString const & rServiceSpecifier, Reference< XComponentContext > const & xContext ) override; virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext( OUString const & rServiceSpecifier, Sequence< Any > const & rArguments, - Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) override; + Reference< XComponentContext > const & xContext ) override; // virtual Sequence< OUString > SAL_CALL getAvailableServiceNames() // throw (RuntimeException); // XMultiServiceFactory - virtual Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException, std::exception) override; - virtual Reference<XInterface > SAL_CALL createInstance(const OUString &) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const OUString &, const Sequence<Any >& Arguments) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual Sequence< OUString > SAL_CALL getAvailableServiceNames() override; + virtual Reference<XInterface > SAL_CALL createInstance(const OUString &) override; + virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const OUString &, const Sequence<Any >& Arguments) override; // The same as the getAvailableServiceNames, but only unique names Sequence< OUString > getUniqueAvailableServiceNames( HashSet_OWString & aNameSet ); // XElementAccess - virtual 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 Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XEnumerationAccess - virtual Reference<XEnumeration > SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) override; + virtual Reference<XEnumeration > SAL_CALL createEnumeration() override; // XSet - virtual sal_Bool SAL_CALL has( const Any & Element ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insert( const Any & Element ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const Any & Element ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL has( const Any & Element ) override; + virtual void SAL_CALL insert( const Any & Element ) override; + virtual void SAL_CALL remove( const Any & Element ) override; // XContentEnumerationAccess //Sequence< OUString > getAvailableServiceNames() throw( (Exception) ); - virtual Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw(css::uno::RuntimeException, std::exception) override; + virtual Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) override; // XComponent - virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; // XPropertySet - Reference<XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue) - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - Any SAL_CALL getPropertyValue(const OUString& PropertyName) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + Reference<XPropertySetInfo > SAL_CALL getPropertySetInfo() override; + void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue) override; + Any SAL_CALL getPropertyValue(const OUString& PropertyName) override; + void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener) override; + void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener) override; + void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener) override; + void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener) override; protected: inline bool is_disposed() const; @@ -509,85 +485,75 @@ public: Reference< XComponentContext > const & xContext ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return Reference< XServiceInfo >(getRoot(), UNO_QUERY_THROW)->getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override { return Reference< XServiceInfo >(getRoot(), UNO_QUERY_THROW)->supportsService( ServiceName ); } - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) override + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override { return Reference< XServiceInfo >(getRoot(), UNO_QUERY_THROW)->getSupportedServiceNames(); } // XMultiComponentFactory virtual Reference< XInterface > SAL_CALL createInstanceWithContext( - OUString const & rServiceSpecifier, Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) override + OUString const & rServiceSpecifier, Reference< XComponentContext > const & xContext ) override { return getRoot()->createInstanceWithContext( rServiceSpecifier, xContext ); } virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext( OUString const & rServiceSpecifier, Sequence< Any > const & rArguments, - Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) override + Reference< XComponentContext > const & xContext ) override { return getRoot()->createInstanceWithArgumentsAndContext( rServiceSpecifier, rArguments, xContext ); } // virtual Sequence< OUString > SAL_CALL getAvailableServiceNames() // throw (RuntimeException); // XMultiServiceFactory - virtual Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (RuntimeException, std::exception) override + virtual Sequence< OUString > SAL_CALL getAvailableServiceNames() override { return getRoot()->getAvailableServiceNames(); } - virtual Reference<XInterface > SAL_CALL createInstance(const OUString & name) throw (Exception, std::exception) override + virtual Reference<XInterface > SAL_CALL createInstance(const OUString & name) override { return getRoot()->createInstanceWithContext( name, m_xContext ); } - virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const OUString & name, const Sequence<Any >& Arguments) throw (Exception, std::exception) override + virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const OUString & name, const Sequence<Any >& Arguments) override { return getRoot()->createInstanceWithArgumentsAndContext( name, Arguments, m_xContext ); } // XElementAccess - virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception) override + virtual Type SAL_CALL getElementType() override { return Reference< XElementAccess >(getRoot(), UNO_QUERY_THROW)->getElementType(); } - virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements() override { return Reference< XElementAccess >(getRoot(), UNO_QUERY_THROW)->hasElements(); } // XEnumerationAccess - virtual Reference<XEnumeration > SAL_CALL createEnumeration() throw (RuntimeException, std::exception) override + virtual Reference<XEnumeration > SAL_CALL createEnumeration() override { return Reference< XEnumerationAccess >(getRoot(), UNO_QUERY_THROW)->createEnumeration(); } // XSet - virtual sal_Bool SAL_CALL has( const Any & Element ) throw (RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL has( const Any & Element ) override { return Reference< XSet >(getRoot(), UNO_QUERY_THROW)->has( Element ); } - virtual void SAL_CALL insert( const Any & Element ) throw (lang::IllegalArgumentException, container::ElementExistException, RuntimeException, std::exception) override + virtual void SAL_CALL insert( const Any & Element ) override { Reference< XSet >(getRoot(), UNO_QUERY_THROW)->insert( Element ); } - virtual void SAL_CALL remove( const Any & Element ) throw (lang::IllegalArgumentException, container::NoSuchElementException, RuntimeException, std::exception) override + virtual void SAL_CALL remove( const Any & Element ) override { Reference< XSet >(getRoot(), UNO_QUERY_THROW)->remove( Element ); } // XContentEnumerationAccess //Sequence< OUString > getAvailableServiceNames() throw( (Exception) ); - virtual Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw (RuntimeException, std::exception) override + virtual Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) override { return Reference< XContentEnumerationAccess >(getRoot(), UNO_QUERY_THROW)->createContentEnumeration( aServiceName ); } // XPropertySet - Reference<XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception) override + Reference<XPropertySetInfo > SAL_CALL getPropertySetInfo() override { return Reference< XPropertySet >(getRoot(), UNO_QUERY_THROW)->getPropertySetInfo(); } - void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, RuntimeException, std::exception) override; - Any SAL_CALL getPropertyValue(const OUString& PropertyName) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException, std::exception) override; + void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue) override; + Any SAL_CALL getPropertyValue(const OUString& PropertyName) override; - void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException, std::exception) override + void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener) override { Reference< XPropertySet >(getRoot(), UNO_QUERY_THROW)->addPropertyChangeListener( PropertyName, aListener ); } - void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException, std::exception) override + void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener) override { Reference< XPropertySet >(getRoot(), UNO_QUERY_THROW)->removePropertyChangeListener( PropertyName, aListener ); } - void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException, std::exception) override + void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener) override { Reference< XPropertySet >(getRoot(), UNO_QUERY_THROW)->addVetoableChangeListener( PropertyName, aListener ); } - void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException, std::exception) override + void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener) override { Reference< XPropertySet >(getRoot(), UNO_QUERY_THROW)->removeVetoableChangeListener( PropertyName, aListener ); } }; void SAL_CALL OServiceManagerWrapper::setPropertyValue( const OUString& PropertyName, const Any& aValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, RuntimeException, std::exception) { if ( PropertyName == "DefaultContext" ) { @@ -612,7 +578,6 @@ void SAL_CALL OServiceManagerWrapper::setPropertyValue( Any SAL_CALL OServiceManagerWrapper::getPropertyValue( const OUString& PropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException, std::exception) { if ( PropertyName == "DefaultContext" ) { @@ -661,7 +626,6 @@ OServiceManager::OServiceManager( Reference< XComponentContext > const & xContex // XComponent void OServiceManager::dispose() - throw(css::uno::RuntimeException, std::exception) { if (rBHelper.bDisposed || rBHelper.bInDispose) return; @@ -712,7 +676,6 @@ void OServiceManager::disposing() // XPropertySet Reference<XPropertySetInfo > OServiceManager::getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) { check_undisposed(); if (! m_xPropertyInfo.is()) @@ -733,7 +696,6 @@ Reference<XPropertySetInfo > OServiceManager::getPropertySetInfo() void OServiceManager::setPropertyValue( const OUString& PropertyName, const Any& aValue ) - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { check_undisposed(); if ( PropertyName == "DefaultContext" ) @@ -760,7 +722,6 @@ void OServiceManager::setPropertyValue( } Any OServiceManager::getPropertyValue(const OUString& PropertyName) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { check_undisposed(); if ( PropertyName == "DefaultContext" ) @@ -781,7 +742,6 @@ Any OServiceManager::getPropertyValue(const OUString& PropertyName) void OServiceManager::addPropertyChangeListener( const OUString&, const Reference<XPropertyChangeListener >&) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { check_undisposed(); throw UnknownPropertyException(); @@ -789,7 +749,6 @@ void OServiceManager::addPropertyChangeListener( void OServiceManager::removePropertyChangeListener( const OUString&, const Reference<XPropertyChangeListener >&) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { check_undisposed(); throw UnknownPropertyException(); @@ -797,7 +756,6 @@ void OServiceManager::removePropertyChangeListener( void OServiceManager::addVetoableChangeListener( const OUString&, const Reference<XVetoableChangeListener >&) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { check_undisposed(); throw UnknownPropertyException(); @@ -805,7 +763,6 @@ void OServiceManager::addVetoableChangeListener( void OServiceManager::removeVetoableChangeListener( const OUString&, const Reference<XVetoableChangeListener >&) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { check_undisposed(); throw UnknownPropertyException(); @@ -845,7 +802,6 @@ Sequence< OUString > OServiceManager::getUniqueAvailableServiceNames( Reference< XInterface > OServiceManager::createInstanceWithContext( OUString const & rServiceSpecifier, Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) { check_undisposed(); #if OSL_DEBUG_LEVEL > 0 @@ -900,7 +856,6 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext( OUString const & rServiceSpecifier, Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) { check_undisposed(); #if OSL_DEBUG_LEVEL > 0 @@ -953,7 +908,6 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext( // XMultiServiceFactory, XMultiComponentFactory, XContentEnumeration Sequence< OUString > OServiceManager::getAvailableServiceNames() - throw(css::uno::RuntimeException, std::exception) { check_undisposed(); // all names @@ -964,7 +918,6 @@ Sequence< OUString > OServiceManager::getAvailableServiceNames() // XMultibleServiceFactory Reference<XInterface > OServiceManager::createInstance( const OUString& rServiceSpecifier ) - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) { return createInstanceWithContext( rServiceSpecifier, m_xContext ); @@ -974,7 +927,6 @@ Reference<XInterface > OServiceManager::createInstance( Reference<XInterface > OServiceManager::createInstanceWithArguments( const OUString& rServiceSpecifier, const Sequence<Any >& rArguments ) - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) { return createInstanceWithArgumentsAndContext( rServiceSpecifier, rArguments, m_xContext ); @@ -982,7 +934,6 @@ Reference<XInterface > OServiceManager::createInstanceWithArguments( // XInitialization void OServiceManager::initialize( Sequence< Any > const & ) - throw (Exception, std::exception) { check_undisposed(); OSL_FAIL( "not impl!" ); @@ -990,21 +941,18 @@ void OServiceManager::initialize( Sequence< Any > const & ) // XServiceInfo OUString OServiceManager::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.stoc.OServiceManager"); } // XServiceInfo sal_Bool OServiceManager::supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } // XServiceInfo Sequence< OUString > OServiceManager::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { Sequence< OUString > seqNames(2); seqNames[0] = "com.sun.star.lang.MultiServiceFactory"; @@ -1053,7 +1001,6 @@ Sequence< Reference< XInterface > > OServiceManager::queryServiceFactories( // XContentEnumerationAccess Reference<XEnumeration > OServiceManager::createContentEnumeration( const OUString& aServiceName ) - throw(css::uno::RuntimeException, std::exception) { check_undisposed(); Sequence< Reference< XInterface > > factories( @@ -1065,7 +1012,7 @@ Reference<XEnumeration > OServiceManager::createContentEnumeration( } // XEnumeration -Reference<XEnumeration > OServiceManager::createEnumeration() throw(css::uno::RuntimeException, std::exception) +Reference<XEnumeration > OServiceManager::createEnumeration() { check_undisposed(); MutexGuard aGuard( m_mutex ); @@ -1074,7 +1021,6 @@ Reference<XEnumeration > OServiceManager::createEnumeration() throw(css::uno::Ru // XElementAccess Type OServiceManager::getElementType() - throw(css::uno::RuntimeException, std::exception) { check_undisposed(); return cppu::UnoType<XInterface>::get(); @@ -1082,7 +1028,6 @@ Type OServiceManager::getElementType() // XElementAccess sal_Bool OServiceManager::hasElements() - throw(css::uno::RuntimeException, std::exception) { check_undisposed(); MutexGuard aGuard( m_mutex ); @@ -1091,7 +1036,6 @@ sal_Bool OServiceManager::hasElements() // XSet sal_Bool OServiceManager::has( const Any & Element ) - throw(css::uno::RuntimeException, std::exception) { check_undisposed(); if( Element.getValueTypeClass() == TypeClass_INTERFACE ) @@ -1112,7 +1056,6 @@ sal_Bool OServiceManager::has( const Any & Element ) // XSet void OServiceManager::insert( const Any & Element ) - throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) { check_undisposed(); if( Element.getValueTypeClass() != TypeClass_INTERFACE ) @@ -1166,9 +1109,6 @@ bool OServiceManager::haveFactoryWithThisImplementation(const OUString& aImplNam // XSet void OServiceManager::remove( const Any & Element ) - throw(css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) { if (is_disposed()) return; @@ -1259,30 +1199,27 @@ public: explicit ORegistryServiceManager( Reference< XComponentContext > const & xContext ); // XInitialization - void SAL_CALL initialize(const Sequence< Any >& Arguments) - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + void SAL_CALL initialize(const Sequence< Any >& Arguments) override; // XServiceInfo - OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.comp.stoc.ORegistryServiceManager"); } - Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XMultiServiceFactory - Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException, std::exception) override; + Sequence< OUString > SAL_CALL getAvailableServiceNames() override; // XContentEnumerationAccess //Sequence< OUString > getAvailableServiceNames() throw( (Exception) ); - Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw(css::uno::RuntimeException, std::exception) override; + Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) override; // XComponent - void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose() override; // OServiceManager - Reference<XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; - Any SAL_CALL getPropertyValue(const OUString& PropertyName) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + Reference<XPropertySetInfo > SAL_CALL getPropertySetInfo() override; + Any SAL_CALL getPropertyValue(const OUString& PropertyName) override; protected: //OServiceManager @@ -1320,7 +1257,6 @@ ORegistryServiceManager::ORegistryServiceManager( Reference< XComponentContext > // XComponent void ORegistryServiceManager::dispose() - throw(css::uno::RuntimeException, std::exception) { if (rBHelper.bDisposed || rBHelper.bInDispose) return; @@ -1459,7 +1395,6 @@ void ORegistryServiceManager::fillAllNamesFromRegistry( HashSet_OWString & rSet // XInitialization void ORegistryServiceManager::initialize(const Sequence< Any >& Arguments) - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) { check_undisposed(); MutexGuard aGuard( m_mutex ); @@ -1477,7 +1412,6 @@ void ORegistryServiceManager::initialize(const Sequence< Any >& Arguments) // XMultiServiceFactory, XContentEnumeration Sequence< OUString > ORegistryServiceManager::getAvailableServiceNames() - throw(css::uno::RuntimeException, std::exception) { check_undisposed(); MutexGuard aGuard( m_mutex ); @@ -1492,7 +1426,6 @@ Sequence< OUString > ORegistryServiceManager::getAvailableServiceNames() // XServiceInfo Sequence< OUString > ORegistryServiceManager::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { Sequence< OUString > seqNames(2); seqNames[0] = "com.sun.star.lang.MultiServiceFactory"; @@ -1524,7 +1457,6 @@ Sequence< Reference< XInterface > > ORegistryServiceManager::queryServiceFactori // XContentEnumerationAccess Reference<XEnumeration > ORegistryServiceManager::createContentEnumeration( const OUString& aServiceName ) - throw(css::uno::RuntimeException, std::exception) { check_undisposed(); MutexGuard aGuard(m_mutex); @@ -1547,7 +1479,6 @@ Reference<XEnumeration > ORegistryServiceManager::createContentEnumeration( // OServiceManager Reference<XPropertySetInfo > ORegistryServiceManager::getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) { check_undisposed(); if (! m_xPropertyInfo.is()) @@ -1570,7 +1501,6 @@ Reference<XPropertySetInfo > ORegistryServiceManager::getPropertySetInfo() } Any ORegistryServiceManager::getPropertyValue(const OUString& PropertyName) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { check_undisposed(); if ( PropertyName == "Registry" ) diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index c48913fcab80..d50c243949f6 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -61,45 +61,33 @@ public: osl::Mutex mutex_; private: - virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getURL() override; virtual void SAL_CALL open( - OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate) override; - virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isValid() override; - virtual void SAL_CALL close() throw ( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close() override; - virtual void SAL_CALL destroy() throw( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL destroy() override; virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL - getRootKey() throw( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + getRootKey() override; - virtual sal_Bool SAL_CALL isReadOnly() throw( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly() override; virtual void SAL_CALL mergeKey( - OUString const & aKeyName, OUString const & aUrl) - throw ( - css::registry::InvalidRegistryException, - css::registry::MergeConflictException, css::uno::RuntimeException, std::exception) override; + OUString const & aKeyName, OUString const & aUrl) override; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.comp.stoc.SimpleRegistry"); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override + getSupportedServiceNames() override { css::uno::Sequence< OUString > names { "com.sun.star.registry.SimpleRegistry" }; return names; @@ -116,158 +104,100 @@ public: registry_(registry), key_(key) {} private: - virtual OUString SAL_CALL getKeyName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getKeyName() override; - virtual sal_Bool SAL_CALL isReadOnly() throw ( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly() override; - virtual sal_Bool SAL_CALL isValid() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isValid() override; virtual css::registry::RegistryKeyType SAL_CALL getKeyType( - OUString const & rKeyName) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + OUString const & rKeyName) override; - virtual css::registry::RegistryValueType SAL_CALL getValueType() throw( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + virtual css::registry::RegistryValueType SAL_CALL getValueType() override; - virtual sal_Int32 SAL_CALL getLongValue() throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getLongValue() override; - virtual void SAL_CALL setLongValue(sal_Int32 value) throw ( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLongValue(sal_Int32 value) override; - virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue() throw( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue() override; virtual void SAL_CALL setLongListValue( - css::uno::Sequence< sal_Int32 > const & seqValue) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int32 > const & seqValue) override; - virtual OUString SAL_CALL getAsciiValue() throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAsciiValue() override; - virtual void SAL_CALL setAsciiValue(OUString const & value) throw ( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAsciiValue(OUString const & value) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue() override; virtual void SAL_CALL setAsciiListValue( - css::uno::Sequence< OUString > const & seqValue) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > const & seqValue) override; - virtual OUString SAL_CALL getStringValue() throw( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getStringValue() override; - virtual void SAL_CALL setStringValue(OUString const & value) throw ( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setStringValue(OUString const & value) override; - virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue() override; virtual void SAL_CALL setStringListValue( - css::uno::Sequence< OUString > const & seqValue) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > const & seqValue) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue() throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue() override; virtual void SAL_CALL setBinaryValue( - css::uno::Sequence< sal_Int8 > const & value) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > const & value) override; virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL openKey( - OUString const & aKeyName) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + OUString const & aKeyName) override; virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL - createKey(OUString const & aKeyName) throw ( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + createKey(OUString const & aKeyName) override; - virtual void SAL_CALL closeKey() throw ( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL closeKey() override; - virtual void SAL_CALL deleteKey(OUString const & rKeyName) throw ( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL deleteKey(OUString const & rKeyName) override; virtual css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > > - SAL_CALL openKeys() throw ( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + SAL_CALL openKeys() override; - virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames() throw ( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames() override; virtual sal_Bool SAL_CALL createLink( - OUString const & aLinkName, OUString const & aLinkTarget) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + OUString const & aLinkName, OUString const & aLinkTarget) override; - virtual void SAL_CALL deleteLink(OUString const & rLinkName) throw ( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL deleteLink(OUString const & rLinkName) override; - virtual OUString SAL_CALL getLinkTarget(OUString const & rLinkName) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLinkTarget(OUString const & rLinkName) override; - virtual OUString SAL_CALL getResolvedName(OUString const & aKeyName) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getResolvedName(OUString const & aKeyName) override; rtl::Reference< SimpleRegistry > registry_; RegistryKey key_; }; -OUString Key::getKeyName() throw (css::uno::RuntimeException, std::exception) { +OUString Key::getKeyName() { osl::MutexGuard guard(registry_->mutex_); return key_.getName(); } sal_Bool Key::isReadOnly() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); return key_.isReadOnly(); } -sal_Bool Key::isValid() throw (css::uno::RuntimeException, std::exception) { +sal_Bool Key::isValid() { osl::MutexGuard guard(registry_->mutex_); return key_.isValid(); } css::registry::RegistryKeyType Key::getKeyType(OUString const & ) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { return css::registry::RegistryKeyType_KEY; } css::registry::RegistryValueType Key::getValueType() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); RegValueType type; @@ -309,9 +239,7 @@ css::registry::RegistryValueType Key::getValueType() } } -sal_Int32 Key::getLongValue() throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) +sal_Int32 Key::getLongValue() { osl::MutexGuard guard(registry_->mutex_); sal_Int32 value; @@ -335,7 +263,6 @@ sal_Int32 Key::getLongValue() throw ( } void Key::setLongValue(sal_Int32 value) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); RegError err = key_.setValue( @@ -349,9 +276,7 @@ void Key::setLongValue(sal_Int32 value) } } -css::uno::Sequence< sal_Int32 > Key::getLongListValue() throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int32 > Key::getLongListValue() { osl::MutexGuard guard(registry_->mutex_); RegistryValueList< sal_Int32 > list; @@ -389,7 +314,6 @@ css::uno::Sequence< sal_Int32 > Key::getLongListValue() throw ( } void Key::setLongListValue(css::uno::Sequence< sal_Int32 > const & seqValue) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); std::vector< sal_Int32 > list; @@ -407,9 +331,7 @@ void Key::setLongListValue(css::uno::Sequence< sal_Int32 > const & seqValue) } } -OUString Key::getAsciiValue() throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) +OUString Key::getAsciiValue() { osl::MutexGuard guard(registry_->mutex_); RegValueType type; @@ -476,7 +398,6 @@ OUString Key::getAsciiValue() throw ( } void Key::setAsciiValue(OUString const & value) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); OString utf8; @@ -503,9 +424,7 @@ void Key::setAsciiValue(OUString const & value) } } -css::uno::Sequence< OUString > Key::getAsciiListValue() throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > Key::getAsciiListValue() { osl::MutexGuard guard(registry_->mutex_); RegistryValueList< char * > list; @@ -560,7 +479,6 @@ css::uno::Sequence< OUString > Key::getAsciiListValue() throw ( void Key::setAsciiListValue( css::uno::Sequence< OUString > const & seqValue) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); std::vector< OString > list; @@ -596,9 +514,7 @@ void Key::setAsciiListValue( } } -OUString Key::getStringValue() throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) +OUString Key::getStringValue() { osl::MutexGuard guard(registry_->mutex_); RegValueType type; @@ -653,7 +569,6 @@ OUString Key::getStringValue() throw ( } void Key::setStringValue(OUString const & value) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); RegError err = key_.setValue( @@ -670,9 +585,7 @@ void Key::setStringValue(OUString const & value) } } -css::uno::Sequence< OUString > Key::getStringListValue() throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > Key::getStringListValue() { osl::MutexGuard guard(registry_->mutex_); RegistryValueList< sal_Unicode * > list; @@ -713,7 +626,6 @@ css::uno::Sequence< OUString > Key::getStringListValue() throw ( void Key::setStringListValue( css::uno::Sequence< OUString > const & seqValue) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); std::vector< sal_Unicode * > list; @@ -733,9 +645,6 @@ void Key::setStringListValue( } css::uno::Sequence< sal_Int8 > Key::getBinaryValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); RegValueType type; @@ -774,7 +683,6 @@ css::uno::Sequence< sal_Int8 > Key::getBinaryValue() } void Key::setBinaryValue(css::uno::Sequence< sal_Int8 > const & value) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); RegError err = key_.setValue( @@ -792,7 +700,6 @@ void Key::setBinaryValue(css::uno::Sequence< sal_Int8 > const & value) css::uno::Reference< css::registry::XRegistryKey > Key::openKey( OUString const & aKeyName) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); RegistryKey key; @@ -813,7 +720,6 @@ css::uno::Reference< css::registry::XRegistryKey > Key::openKey( css::uno::Reference< css::registry::XRegistryKey > Key::createKey( OUString const & aKeyName) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); RegistryKey key; @@ -833,7 +739,6 @@ css::uno::Reference< css::registry::XRegistryKey > Key::createKey( } void Key::closeKey() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); RegError err = key_.closeKey(); @@ -847,7 +752,6 @@ void Key::closeKey() } void Key::deleteKey(OUString const & rKeyName) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); RegError err = key_.deleteKey(rKeyName); @@ -862,7 +766,6 @@ void Key::deleteKey(OUString const & rKeyName) css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > > Key::openKeys() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); RegistryKeyArray list; @@ -891,7 +794,6 @@ Key::openKeys() } css::uno::Sequence< OUString > Key::getKeyNames() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); RegistryKeyNames list; @@ -919,7 +821,6 @@ css::uno::Sequence< OUString > Key::getKeyNames() sal_Bool Key::createLink( OUString const & /*aLinkName*/, OUString const & /*aLinkTarget*/) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::registry::InvalidRegistryException( "com.sun.star.registry.SimpleRegistry key createLink: links are no longer supported", @@ -927,7 +828,6 @@ sal_Bool Key::createLink( } void Key::deleteLink(OUString const & /*rLinkName*/) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::registry::InvalidRegistryException( "com.sun.star.registry.SimpleRegistry key deleteLink: links are no longer supported", @@ -935,7 +835,6 @@ void Key::deleteLink(OUString const & /*rLinkName*/) } OUString Key::getLinkTarget(OUString const & /*rLinkName*/) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::registry::InvalidRegistryException( "com.sun.star.registry.SimpleRegistry key getLinkTarget: links are no longer supported", @@ -943,7 +842,6 @@ OUString Key::getLinkTarget(OUString const & /*rLinkName*/) } OUString Key::getResolvedName(OUString const & aKeyName) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(registry_->mutex_); OUString resolved; @@ -958,14 +856,13 @@ OUString Key::getResolvedName(OUString const & aKeyName) return resolved; } -OUString SimpleRegistry::getURL() throw (css::uno::RuntimeException, std::exception) { +OUString SimpleRegistry::getURL() { osl::MutexGuard guard(mutex_); return registry_.getName(); } void SimpleRegistry::open( OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(mutex_); RegError err = (rURL.isEmpty() && bCreate) @@ -984,13 +881,12 @@ void SimpleRegistry::open( } } -sal_Bool SimpleRegistry::isValid() throw (css::uno::RuntimeException, std::exception) { +sal_Bool SimpleRegistry::isValid() { osl::MutexGuard guard(mutex_); return registry_.isValid(); } void SimpleRegistry::close() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(mutex_); RegError err = registry_.close(); @@ -1004,7 +900,6 @@ void SimpleRegistry::close() } void SimpleRegistry::destroy() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(mutex_); RegError err = registry_.destroy(OUString()); @@ -1018,7 +913,6 @@ void SimpleRegistry::destroy() } css::uno::Reference< css::registry::XRegistryKey > SimpleRegistry::getRootKey() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(mutex_); RegistryKey root; @@ -1034,7 +928,6 @@ css::uno::Reference< css::registry::XRegistryKey > SimpleRegistry::getRootKey() } sal_Bool SimpleRegistry::isReadOnly() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(mutex_); return registry_.isReadOnly(); @@ -1042,9 +935,6 @@ sal_Bool SimpleRegistry::isReadOnly() void SimpleRegistry::mergeKey( OUString const & aKeyName, OUString const & aUrl) - throw ( - css::registry::InvalidRegistryException, - css::registry::MergeConflictException, css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(mutex_); RegistryKey root; diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index 83f99ada0a98..37b87f217900 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -245,45 +245,39 @@ class TypeConverter_Impl : public WeakImplHelper< XTypeConverter, XServiceInfo > // ...misc helpers... /// @throws CannotConvertException static sal_Int64 toHyper( - const Any& rAny, sal_Int64 min, sal_uInt64 max = SAL_UINT64_MAX ) - throw( CannotConvertException ); + const Any& rAny, sal_Int64 min, sal_uInt64 max = SAL_UINT64_MAX ); /// @throws CannotConvertException - static double toDouble( const Any& rAny, double min = -DBL_MAX, double max = DBL_MAX ) - throw( CannotConvertException ); + static double toDouble( const Any& rAny, double min = -DBL_MAX, double max = DBL_MAX ); public: TypeConverter_Impl(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( RuntimeException, std::exception ) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XTypeConverter - virtual Any SAL_CALL convertTo( const Any& aFrom, const Type& DestinationType ) - throw( IllegalArgumentException, CannotConvertException, RuntimeException, std::exception) override; - virtual Any SAL_CALL convertToSimpleType( const Any& aFrom, TypeClass aDestinationType ) - throw( IllegalArgumentException, CannotConvertException, RuntimeException, std::exception) override; + virtual Any SAL_CALL convertTo( const Any& aFrom, const Type& DestinationType ) override; + virtual Any SAL_CALL convertToSimpleType( const Any& aFrom, TypeClass aDestinationType ) override; }; TypeConverter_Impl::TypeConverter_Impl() {} // XServiceInfo -OUString TypeConverter_Impl::getImplementationName() throw( RuntimeException, std::exception ) +OUString TypeConverter_Impl::getImplementationName() { return OUString("com.sun.star.comp.stoc.TypeConverter"); } // XServiceInfo -sal_Bool TypeConverter_Impl::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) +sal_Bool TypeConverter_Impl::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } // XServiceInfo -Sequence< OUString > TypeConverter_Impl::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > TypeConverter_Impl::getSupportedServiceNames() { Sequence< OUString > seqNames { "com.sun.star.script.Converter" }; return seqNames; @@ -291,7 +285,6 @@ Sequence< OUString > TypeConverter_Impl::getSupportedServiceNames() throw( Runti sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt64 max ) - throw( CannotConvertException ) { sal_Int64 nRet; TypeClass aDestinationClass = rAny.getValueTypeClass(); @@ -406,7 +399,6 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt6 double TypeConverter_Impl::toDouble( const Any& rAny, double min, double max ) - throw( CannotConvertException ) { double fRet; TypeClass aDestinationClass = rAny.getValueTypeClass(); @@ -487,7 +479,6 @@ double TypeConverter_Impl::toDouble( const Any& rAny, double min, double max ) Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestType ) - throw( IllegalArgumentException, CannotConvertException, RuntimeException, std::exception) { const Type& aSourceType = rVal.getValueType(); if (aSourceType == aDestType) @@ -681,7 +672,6 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestinationClass ) - throw( IllegalArgumentException, CannotConvertException, RuntimeException, std::exception ) { switch (aDestinationClass) { diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx index c6ff6bbffa64..f618b4a7ae1c 100644 --- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx +++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx @@ -49,41 +49,34 @@ public: Translator(const Translator&) = delete; Translator& operator=(const Translator&) = delete; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; virtual OUString SAL_CALL - translateToInternal(OUString const & externalUriReference) - throw (css::uno::RuntimeException, std::exception) override; + translateToInternal(OUString const & externalUriReference) override; virtual OUString SAL_CALL - translateToExternal(OUString const & internalUriReference) - throw (css::uno::RuntimeException, std::exception) override; + translateToExternal(OUString const & internalUriReference) override; private: virtual ~Translator() override {} }; OUString Translator::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.uri.ExternalUriReferenceTranslator"); } sal_Bool Translator::supportsService(OUString const & serviceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } css::uno::Sequence< OUString > Translator::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > s { "com.sun.star.uri.ExternalUriReferenceTranslator" }; return s; @@ -91,7 +84,6 @@ css::uno::Sequence< OUString > Translator::getSupportedServiceNames() OUString Translator::translateToInternal( OUString const & externalUriReference) - throw (css::uno::RuntimeException, std::exception) { if (!externalUriReference.matchIgnoreAsciiCase("file:/")) { @@ -140,7 +132,6 @@ OUString Translator::translateToInternal( OUString Translator::translateToExternal( OUString const & internalUriReference) - throw (css::uno::RuntimeException, std::exception) { if (!internalUriReference.matchIgnoreAsciiCase("file://")) { diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx index 57d950e842ba..2baa1f3b9b20 100644 --- a/stoc/source/uriproc/UriReference.cxx +++ b/stoc/source/uriproc/UriReference.cxx @@ -51,7 +51,7 @@ UriReference::UriReference( UriReference::~UriReference() {} -OUString UriReference::getUriReference() throw (css::uno::RuntimeException) +OUString UriReference::getUriReference() { osl::MutexGuard g(m_mutex); OUStringBuffer buf; @@ -67,13 +67,12 @@ OUString UriReference::getUriReference() throw (css::uno::RuntimeException) return buf.makeStringAndClear(); } -bool UriReference::isAbsolute() throw (css::uno::RuntimeException) { +bool UriReference::isAbsolute() { return !m_scheme.isEmpty(); } OUString UriReference::getSchemeSpecificPart() - throw (css::uno::RuntimeException) { osl::MutexGuard g(m_mutex); OUStringBuffer buf; @@ -81,33 +80,33 @@ OUString UriReference::getSchemeSpecificPart() return buf.makeStringAndClear(); } -bool UriReference::isHierarchical() throw (css::uno::RuntimeException) { +bool UriReference::isHierarchical() { osl::MutexGuard g(m_mutex); return m_isHierarchical; } -bool UriReference::hasAuthority() throw (css::uno::RuntimeException) { +bool UriReference::hasAuthority() { osl::MutexGuard g(m_mutex); return m_hasAuthority; } -OUString UriReference::getAuthority() throw (css::uno::RuntimeException) { +OUString UriReference::getAuthority() { osl::MutexGuard g(m_mutex); return m_authority; } -OUString UriReference::getPath() throw (css::uno::RuntimeException) { +OUString UriReference::getPath() { osl::MutexGuard g(m_mutex); return m_path; } -bool UriReference::hasRelativePath() throw (css::uno::RuntimeException) { +bool UriReference::hasRelativePath() { osl::MutexGuard g(m_mutex); return m_isHierarchical && !m_hasAuthority && (m_path.isEmpty() || m_path[0] != '/'); } -sal_Int32 UriReference::getPathSegmentCount() throw (css::uno::RuntimeException) +sal_Int32 UriReference::getPathSegmentCount() { osl::MutexGuard g(m_mutex); if (!m_isHierarchical || m_path.isEmpty()) { @@ -126,7 +125,6 @@ sal_Int32 UriReference::getPathSegmentCount() throw (css::uno::RuntimeException) } OUString UriReference::getPathSegment(sal_Int32 index) - throw (css::uno::RuntimeException) { osl::MutexGuard g(m_mutex); if (m_isHierarchical && !m_path.isEmpty() && index >= 0) { @@ -144,35 +142,34 @@ OUString UriReference::getPathSegment(sal_Int32 index) return OUString(); } -bool UriReference::hasQuery() throw (css::uno::RuntimeException) { +bool UriReference::hasQuery() { osl::MutexGuard g(m_mutex); return m_hasQuery; } -OUString UriReference::getQuery() throw (css::uno::RuntimeException) { +OUString UriReference::getQuery() { osl::MutexGuard g(m_mutex); return m_query; } -bool UriReference::hasFragment() throw (css::uno::RuntimeException) { +bool UriReference::hasFragment() { osl::MutexGuard g(m_mutex); return m_hasFragment; } -OUString UriReference::getFragment() throw (css::uno::RuntimeException) { +OUString UriReference::getFragment() { osl::MutexGuard g(m_mutex); return m_fragment; } void UriReference::setFragment(OUString const & fragment) - throw (css::uno::RuntimeException) { osl::MutexGuard g(m_mutex); m_hasFragment = true; m_fragment = fragment; } -void UriReference::clearFragment() throw (css::uno::RuntimeException) { +void UriReference::clearFragment() { osl::MutexGuard g(m_mutex); m_hasFragment = false; m_fragment.clear(); diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx index e052eee03f52..05fdc37f6e09 100644 --- a/stoc/source/uriproc/UriReference.hxx +++ b/stoc/source/uriproc/UriReference.hxx @@ -38,60 +38,55 @@ public: ~UriReference(); /// @throws css::uno::RuntimeException - OUString getUriReference() - throw (css::uno::RuntimeException); + OUString getUriReference(); /// @throws css::uno::RuntimeException - bool isAbsolute() throw (css::uno::RuntimeException); + bool isAbsolute(); /// @throws css::uno::RuntimeException - const OUString& getScheme() throw (css::uno::RuntimeException) { return m_scheme;} + const OUString& getScheme() { return m_scheme;} /// @throws css::uno::RuntimeException - OUString getSchemeSpecificPart() - throw (css::uno::RuntimeException); + OUString getSchemeSpecificPart(); /// @throws css::uno::RuntimeException - bool isHierarchical() throw (css::uno::RuntimeException); + bool isHierarchical(); /// @throws css::uno::RuntimeException - bool hasAuthority() throw (css::uno::RuntimeException); + bool hasAuthority(); /// @throws css::uno::RuntimeException - OUString getAuthority() throw (css::uno::RuntimeException); + OUString getAuthority(); /// @throws css::uno::RuntimeException - OUString getPath() throw (css::uno::RuntimeException); + OUString getPath(); /// @throws css::uno::RuntimeException - bool hasRelativePath() throw (css::uno::RuntimeException); + bool hasRelativePath(); /// @throws css::uno::RuntimeException - sal_Int32 getPathSegmentCount() - throw (css::uno::RuntimeException); + sal_Int32 getPathSegmentCount(); /// @throws css::uno::RuntimeException - OUString getPathSegment(sal_Int32 index) - throw (css::uno::RuntimeException); + OUString getPathSegment(sal_Int32 index); /// @throws css::uno::RuntimeException - bool hasQuery() throw (css::uno::RuntimeException); + bool hasQuery(); /// @throws css::uno::RuntimeException - OUString getQuery() throw (css::uno::RuntimeException); + OUString getQuery(); /// @throws css::uno::RuntimeException - bool hasFragment() throw (css::uno::RuntimeException); + bool hasFragment(); /// @throws css::uno::RuntimeException - OUString getFragment() throw (css::uno::RuntimeException); + OUString getFragment(); /// @throws css::uno::RuntimeException - void setFragment(OUString const & fragment) - throw (css::uno::RuntimeException); + void setFragment(OUString const & fragment); /// @throws css::uno::RuntimeException - void clearFragment() throw (css::uno::RuntimeException); + void clearFragment(); osl::Mutex m_mutex; OUString m_scheme; diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx index 11f02ca50b3e..71efcf275945 100644 --- a/stoc/source/uriproc/UriReferenceFactory.cxx +++ b/stoc/source/uriproc/UriReferenceFactory.cxx @@ -107,72 +107,55 @@ public: UriReference(const UriReference&) = delete; UriReference& operator=(const UriReference&) = delete; - virtual OUString SAL_CALL getUriReference() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getUriReference() override { return m_base.getUriReference(); } - virtual sal_Bool SAL_CALL isAbsolute() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isAbsolute() override { return m_base.isAbsolute(); } - virtual OUString SAL_CALL getScheme() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getScheme() override { return m_base.getScheme(); } - virtual OUString SAL_CALL getSchemeSpecificPart() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getSchemeSpecificPart() override { return m_base.getSchemeSpecificPart(); } - virtual sal_Bool SAL_CALL isHierarchical() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isHierarchical() override { return m_base.isHierarchical(); } - virtual sal_Bool SAL_CALL hasAuthority() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAuthority() override { return m_base.hasAuthority(); } - virtual OUString SAL_CALL getAuthority() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getAuthority() override { return m_base.getAuthority(); } - virtual OUString SAL_CALL getPath() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPath() override { return m_base.getPath(); } - virtual sal_Bool SAL_CALL hasRelativePath() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasRelativePath() override { return m_base.hasRelativePath(); } - virtual sal_Int32 SAL_CALL getPathSegmentCount() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getPathSegmentCount() override { return m_base.getPathSegmentCount(); } - virtual OUString SAL_CALL getPathSegment(sal_Int32 index) - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPathSegment(sal_Int32 index) override { return m_base.getPathSegment(index); } - virtual sal_Bool SAL_CALL hasQuery() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasQuery() override { return m_base.hasQuery(); } - virtual OUString SAL_CALL getQuery() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getQuery() override { return m_base.getQuery(); } - virtual sal_Bool SAL_CALL hasFragment() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasFragment() override { return m_base.hasFragment(); } - virtual OUString SAL_CALL getFragment() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getFragment() override { return m_base.getFragment(); } - virtual void SAL_CALL setFragment(OUString const & fragment) - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setFragment(OUString const & fragment) override { m_base.setFragment(fragment); } - virtual void SAL_CALL clearFragment() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL clearFragment() override { m_base.clearFragment(); } private: @@ -269,26 +252,22 @@ public: Factory(const Factory&) = delete; Factory& operator=(const Factory&) = delete; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL - parse(OUString const & uriReference) - throw (css::uno::RuntimeException, std::exception) override; + parse(OUString const & uriReference) override; virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL makeAbsolute( css::uno::Reference< css::uri::XUriReference > const & baseUriReference, css::uno::Reference< css::uri::XUriReference > const & uriReference, sal_Bool processSpecialBaseSegments, - css::uri::RelativeUriExcessParentSegments excessParentSegments) - throw (css::uno::RuntimeException, std::exception) override; + css::uri::RelativeUriExcessParentSegments excessParentSegments) override; virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL makeRelative( @@ -296,8 +275,7 @@ public: css::uno::Reference< css::uri::XUriReference > const & uriReference, sal_Bool preferAuthorityOverRelativePath, sal_Bool preferAbsoluteOverRelativePath, - sal_Bool encodeRetainedSpecialSegments) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool encodeRetainedSpecialSegments) override; private: virtual ~Factory() override {} @@ -310,19 +288,16 @@ private: }; OUString Factory::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.uri.UriReferenceFactory"); } sal_Bool Factory::supportsService(OUString const & serviceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } css::uno::Sequence< OUString > Factory::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > s { "com.sun.star.uri.UriReferenceFactory" }; return s; @@ -330,7 +305,6 @@ css::uno::Sequence< OUString > Factory::getSupportedServiceNames() css::uno::Reference< css::uri::XUriReference > Factory::parse( OUString const & uriReference) - throw (css::uno::RuntimeException, std::exception) { sal_Int32 fragment = uriReference.indexOf('#'); if (fragment == -1) { @@ -402,7 +376,6 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute( css::uno::Reference< css::uri::XUriReference > const & uriReference, sal_Bool processSpecialBaseSegments, css::uri::RelativeUriExcessParentSegments excessParentSegments) - throw (css::uno::RuntimeException, std::exception) { if (!baseUriReference.is() || !baseUriReference->isAbsolute() || !baseUriReference->isHierarchical() || !uriReference.is()) { @@ -518,7 +491,6 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative( sal_Bool preferAuthorityOverRelativePath, sal_Bool preferAbsoluteOverRelativePath, sal_Bool encodeRetainedSpecialSegments) - throw (css::uno::RuntimeException, std::exception) { if (!baseUriReference.is() || !baseUriReference->isAbsolute() || !baseUriReference->isHierarchical() || !uriReference.is()) { diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx index 1bc7bbefcf42..d246f07c9221 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx @@ -67,73 +67,59 @@ public: UrlReference(const UrlReference&) = delete; UrlReference& operator=(const UrlReference&) = delete; - virtual OUString SAL_CALL getUriReference() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getUriReference() override { return base_.getUriReference(); } - virtual sal_Bool SAL_CALL isAbsolute() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isAbsolute() override { return base_.isAbsolute(); } - virtual OUString SAL_CALL getScheme() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getScheme() override { return base_.getScheme(); } - virtual OUString SAL_CALL getSchemeSpecificPart() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getSchemeSpecificPart() override { return base_.getSchemeSpecificPart(); } - virtual sal_Bool SAL_CALL isHierarchical() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isHierarchical() override { return base_.isHierarchical(); } - virtual sal_Bool SAL_CALL hasAuthority() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAuthority() override { return base_.hasAuthority(); } - virtual OUString SAL_CALL getAuthority() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getAuthority() override { return base_.getAuthority(); } - virtual OUString SAL_CALL getPath() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPath() override { return base_.getPath(); } - virtual sal_Bool SAL_CALL hasRelativePath() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasRelativePath() override { return base_.hasRelativePath(); } - virtual ::sal_Int32 SAL_CALL getPathSegmentCount() - throw (css::uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getPathSegmentCount() override { return base_.getPathSegmentCount(); } - virtual OUString SAL_CALL getPathSegment(sal_Int32 index) - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPathSegment(sal_Int32 index) override { return base_.getPathSegment(index); } - virtual sal_Bool SAL_CALL hasQuery() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasQuery() override { return base_.hasQuery(); } - virtual OUString SAL_CALL getQuery() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getQuery() override { return base_.getQuery(); } - virtual sal_Bool SAL_CALL hasFragment() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasFragment() override { return base_.hasFragment(); } - virtual OUString SAL_CALL getFragment() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getFragment() override { return base_.getFragment(); } - virtual void SAL_CALL setFragment(OUString const & fragment) - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setFragment(OUString const & fragment) override { base_.setFragment(fragment); } - virtual void SAL_CALL clearFragment() throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL clearFragment() override { base_.clearFragment(); } virtual OUString SAL_CALL expand( - css::uno::Reference< css::util::XMacroExpander > const & expander) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::util::XMacroExpander > const & expander) override; private: virtual ~UrlReference() override {} @@ -143,7 +129,6 @@ private: OUString UrlReference::expand( css::uno::Reference< css::util::XMacroExpander > const & expander) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OSL_ASSERT(expander.is()); return expander->expandMacros( @@ -161,40 +146,34 @@ public: Parser(const Parser&) = delete; Parser& operator=(const Parser&) = delete; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - OUString const & serviceName) - throw (css::uno::RuntimeException, std::exception) override; + OUString const & serviceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL parse( OUString const & scheme, - OUString const & schemeSpecificPart) - throw (css::uno::RuntimeException, std::exception) override; + OUString const & schemeSpecificPart) override; private: virtual ~Parser() override {} }; OUString Parser::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand"); } sal_Bool Parser::supportsService(OUString const & serviceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } css::uno::Sequence< OUString > Parser::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > s { "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand" }; return s; @@ -202,7 +181,6 @@ css::uno::Sequence< OUString > Parser::getSupportedServiceNames() css::uno::Reference< css::uri::XUriReference > Parser::parse( OUString const & scheme, OUString const & schemeSpecificPart) - throw (css::uno::RuntimeException, std::exception) { if (!parseSchemeSpecificPart(schemeSpecificPart)) { return css::uno::Reference< css::uri::XUriReference >(); diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index c63093d79ce7..c57670e27f20 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -201,87 +201,66 @@ public: UrlReference(const UrlReference&) = delete; UrlReference& operator=(const UrlReference&) = delete; - virtual OUString SAL_CALL getUriReference() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getUriReference() override { return m_base.getUriReference(); } - virtual sal_Bool SAL_CALL isAbsolute() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isAbsolute() override { return m_base.isAbsolute(); } - virtual OUString SAL_CALL getScheme() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getScheme() override { return m_base.getScheme(); } - virtual OUString SAL_CALL getSchemeSpecificPart() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getSchemeSpecificPart() override { return m_base.getSchemeSpecificPart(); } - virtual sal_Bool SAL_CALL isHierarchical() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isHierarchical() override { return m_base.isHierarchical(); } - virtual sal_Bool SAL_CALL hasAuthority() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasAuthority() override { return m_base.hasAuthority(); } - virtual OUString SAL_CALL getAuthority() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getAuthority() override { return m_base.getAuthority(); } - virtual OUString SAL_CALL getPath() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPath() override { return m_base.getPath(); } - virtual sal_Bool SAL_CALL hasRelativePath() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasRelativePath() override { return m_base.hasRelativePath(); } - virtual sal_Int32 SAL_CALL getPathSegmentCount() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getPathSegmentCount() override { return m_base.getPathSegmentCount(); } - virtual OUString SAL_CALL getPathSegment(sal_Int32 index) - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPathSegment(sal_Int32 index) override { return m_base.getPathSegment(index); } - virtual sal_Bool SAL_CALL hasQuery() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasQuery() override { return m_base.hasQuery(); } - virtual OUString SAL_CALL getQuery() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getQuery() override { return m_base.getQuery(); } - virtual sal_Bool SAL_CALL hasFragment() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasFragment() override { return m_base.hasFragment(); } - virtual OUString SAL_CALL getFragment() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getFragment() override { return m_base.getFragment(); } - virtual void SAL_CALL setFragment(OUString const & fragment) - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setFragment(OUString const & fragment) override { m_base.setFragment(fragment); } - virtual void SAL_CALL clearFragment() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL clearFragment() override { m_base.clearFragment(); } - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; - virtual void SAL_CALL setName(OUString const & name) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + virtual void SAL_CALL setName(OUString const & name) override; - virtual sal_Bool SAL_CALL hasParameter(OUString const & key) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasParameter(OUString const & key) override; - virtual OUString SAL_CALL getParameter(OUString const & key) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getParameter(OUString const & key) override; - virtual void SAL_CALL setParameter(OUString const & key, OUString const & value) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + virtual void SAL_CALL setParameter(OUString const & key, OUString const & value) override; private: virtual ~UrlReference() override {} @@ -291,13 +270,13 @@ private: stoc::uriproc::UriReference m_base; }; -OUString UrlReference::getName() throw (css::uno::RuntimeException, std::exception) { +OUString UrlReference::getName() { osl::MutexGuard g(m_base.m_mutex); sal_Int32 i = 0; return parsePart(m_base.m_path, true, &i); } -void SAL_CALL UrlReference::setName(OUString const & name) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) +void SAL_CALL UrlReference::setName(OUString const & name) { if (name.isEmpty()) throw css::lang::IllegalArgumentException( @@ -314,14 +293,12 @@ void SAL_CALL UrlReference::setName(OUString const & name) throw (css::uno::Runt } sal_Bool UrlReference::hasParameter(OUString const & key) - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(m_base.m_mutex); return findParameter(key) >= 0; } OUString UrlReference::getParameter(OUString const & key) - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(m_base.m_mutex); sal_Int32 i = findParameter(key); @@ -329,7 +306,6 @@ OUString UrlReference::getParameter(OUString const & key) } void UrlReference::setParameter(OUString const & key, OUString const & value) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) { if (key.isEmpty()) throw css::lang::IllegalArgumentException( @@ -386,38 +362,32 @@ public: Parser(const Parser&) = delete; Parser& operator=(const Parser&) = delete; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL parse( - OUString const & scheme, OUString const & schemeSpecificPart) - throw (css::uno::RuntimeException, std::exception) override; + OUString const & scheme, OUString const & schemeSpecificPart) override; private: virtual ~Parser() override {} }; OUString Parser::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"); } sal_Bool Parser::supportsService(OUString const & serviceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } css::uno::Sequence< OUString > Parser::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > s { "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript" }; return s; @@ -426,7 +396,6 @@ css::uno::Sequence< OUString > Parser::getSupportedServiceNames() css::uno::Reference< css::uri::XUriReference > Parser::parse( OUString const & scheme, OUString const & schemeSpecificPart) - throw (css::uno::RuntimeException, std::exception) { if (!parseSchemeSpecificPart(schemeSpecificPart)) { return nullptr; diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx index 5d2b25852fa4..dc7fbf0015ff 100644 --- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx +++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx @@ -54,19 +54,16 @@ public: Factory(const Factory&) = delete; Factory& operator=(const Factory&) = delete; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL createVndSunStarPkgUrlReference( - css::uno::Reference< css::uri::XUriReference > const & authority) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::uri::XUriReference > const & authority) override; private: virtual ~Factory() override {} @@ -75,19 +72,16 @@ private: }; OUString Factory::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory"); } sal_Bool Factory::supportsService(OUString const & serviceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } css::uno::Sequence< OUString > Factory::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > s { "com.sun.star.uri.VndSunStarPkgUrlReferenceFactory" }; return s; @@ -96,7 +90,6 @@ css::uno::Sequence< OUString > Factory::getSupportedServiceNames() css::uno::Reference< css::uri::XUriReference > Factory::createVndSunStarPkgUrlReference( css::uno::Reference< css::uri::XUriReference > const & authority) - throw (css::uno::RuntimeException, std::exception) { OSL_ASSERT(authority.is()); if (authority->isAbsolute() && !authority->hasFragment()) { |