diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /cppuhelper/source/typemanager.cxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'cppuhelper/source/typemanager.cxx')
-rw-r--r-- | cppuhelper/source/typemanager.cxx | 254 |
1 files changed, 127 insertions, 127 deletions
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx index 02de9ff43371..aa93761db2b1 100644 --- a/cppuhelper/source/typemanager.cxx +++ b/cppuhelper/source/typemanager.cxx @@ -93,10 +93,10 @@ private: virtual ~SimpleTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return typeClass_; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } css::uno::TypeClass typeClass_; @@ -117,14 +117,14 @@ private: virtual ~SequenceTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_SEQUENCE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getReferencedType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getReferencedType() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(componentType_); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -141,7 +141,7 @@ protected: virtual ~PublishableDescription() {} private: - virtual sal_Bool SAL_CALL isPublished() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isPublished() throw (css::uno::RuntimeException, std::exception) override { return published_; } bool published_; @@ -162,16 +162,16 @@ private: virtual ~ModuleDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_MODULE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMembers() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMembers() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -214,21 +214,21 @@ private: virtual ~EnumTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_ENUM; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual sal_Int32 SAL_CALL getDefaultEnumValue() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return entity_->getMembers()[0].value; } virtual css::uno::Sequence< rtl::OUString > SAL_CALL getEnumNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< sal_Int32 > SAL_CALL getEnumValues() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; rtl::OUString name_; rtl::Reference< unoidl::EnumTypeEntity > entity_; @@ -276,14 +276,14 @@ private: virtual ~PlainStructTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_STRUCT; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + getBaseType() throw (css::uno::RuntimeException, std::exception) override { return entity_->getDirectBase().isEmpty() ? css::uno::Reference< css::reflection::XTypeDescription >() : manager_->resolve(entity_->getDirectBase()); @@ -292,19 +292,19 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< rtl::OUString >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >(); } @@ -352,10 +352,10 @@ private: virtual ~ParameterizedMemberTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_UNKNOWN; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return typeParameterName_; } rtl::OUString typeParameterName_; @@ -382,31 +382,31 @@ private: virtual ~PolymorphicStructTypeTemplateDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_STRUCT; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getBaseType() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::reflection::XTypeDescription >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >(); } @@ -480,32 +480,32 @@ private: virtual ~InstantiatedPolymorphicStructTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_STRUCT; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getBaseType() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::reflection::XTypeDescription >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< rtl::OUString >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -585,14 +585,14 @@ private: virtual ~ExceptionTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_EXCEPTION; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + getBaseType() throw (css::uno::RuntimeException, std::exception) override { return entity_->getDirectBase().isEmpty() ? css::uno::Reference< css::reflection::XTypeDescription >() : manager_->resolve(entity_->getDirectBase()); @@ -601,10 +601,10 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -653,38 +653,38 @@ private: virtual ~AttributeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_INTERFACE_ATTRIBUTE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual rtl::OUString SAL_CALL getMemberName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return attribute_.name; } - virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override { return position_; } - virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override { return attribute_.readOnly; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getType() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(attribute_.type); } - virtual sal_Bool SAL_CALL isBound() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isBound() throw (css::uno::RuntimeException, std::exception) override { return attribute_.bound; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XCompoundTypeDescription > > - SAL_CALL getGetExceptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getGetExceptions() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XCompoundTypeDescription > > - SAL_CALL getSetExceptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getSetExceptions() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -736,14 +736,14 @@ public: private: virtual ~MethodParameter() {} - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return parameter_.name; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getType() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(parameter_.type); } - virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException, std::exception) override { return (parameter_.direction == unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_IN) @@ -752,7 +752,7 @@ private: DIRECTION_IN_OUT); } - virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException, std::exception) override { return (parameter_.direction == unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_OUT) @@ -761,7 +761,7 @@ private: DIRECTION_IN_OUT); } - virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override { return position_; } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -785,35 +785,35 @@ private: virtual ~MethodDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_INTERFACE_METHOD; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual rtl::OUString SAL_CALL getMemberName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return method_.name; } - virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override { return position_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getReturnType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getReturnType() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(method_.returnType); } - virtual sal_Bool SAL_CALL isOneway() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isOneway() throw (css::uno::RuntimeException, std::exception) override { return false; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XMethodParameter > > - SAL_CALL getParameters() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getParameters() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getExceptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getExceptions() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -917,37 +917,37 @@ private: virtual ~InterfaceTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_INTERFACE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + getBaseType() throw (css::uno::RuntimeException, std::exception) override { return entity_->getDirectMandatoryBases().empty() ? css::uno::Reference< css::reflection::XTypeDescription >() : manager_->resolve(entity_->getDirectMandatoryBases()[0].name); } - virtual css::uno::Uik SAL_CALL getUik() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Uik SAL_CALL getUik() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Uik(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceMemberTypeDescription > > - SAL_CALL getMembers() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMembers() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getBaseTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getBaseTypes() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getOptionalBaseTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getOptionalBaseTypes() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -1021,14 +1021,14 @@ private: virtual ~ConstantDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_CONSTANT; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Any SAL_CALL getConstantValue() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return value_; } rtl::OUString name_; @@ -1093,16 +1093,16 @@ private: virtual ~ConstantGroupDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_CONSTANTS; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XConstantTypeDescription > > - SAL_CALL getConstants() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getConstants() throw (css::uno::RuntimeException, std::exception) override; rtl::OUString name_; rtl::Reference< unoidl::ConstantGroupEntity > entity_; @@ -1139,14 +1139,14 @@ private: virtual ~TypedefDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_TYPEDEF; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getReferencedType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getReferencedType() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(entity_->getType()); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1169,24 +1169,24 @@ public: private: virtual ~ConstructorParameter() {} - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return parameter_.name; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getType() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(parameter_.type); } - virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException, std::exception) override { return true; } - virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException, std::exception) override { return false; } - virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override { return position_; } virtual sal_Bool SAL_CALL isRestParameter() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return parameter_.rest; } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1211,21 +1211,21 @@ private: virtual ~ConstructorDescription() {} virtual sal_Bool SAL_CALL isDefaultConstructor() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return constructor_.defaultConstructor; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return constructor_.name; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XParameter > > - SAL_CALL getParameters() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getParameters() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XCompoundTypeDescription > > - SAL_CALL getExceptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getExceptions() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; unoidl::SingleInterfaceBasedServiceEntity::Constructor constructor_; @@ -1280,16 +1280,16 @@ private: virtual ~SingleInterfaceBasedServiceDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_SERVICE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > > - SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > >(); @@ -1298,7 +1298,7 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > > - SAL_CALL getOptionalServices() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getOptionalServices() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > >(); @@ -1307,7 +1307,7 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceTypeDescription > > - SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< @@ -1317,7 +1317,7 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceTypeDescription > > - SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< @@ -1327,7 +1327,7 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XPropertyTypeDescription > > - SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< @@ -1335,17 +1335,17 @@ private: } virtual sal_Bool SAL_CALL isSingleInterfaceBased() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return true; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getInterface() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getInterface() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(entity_->getBase()); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceConstructorDescription > > - SAL_CALL getConstructors() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getConstructors() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -1383,18 +1383,18 @@ private: virtual ~PropertyDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_PROPERTY; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return property_.name; } virtual sal_Int16 SAL_CALL getPropertyFlags() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return property_.attributes; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getPropertyTypeDescription() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getPropertyTypeDescription() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(property_.type); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1422,49 +1422,49 @@ private: virtual ~AccumulationBasedServiceDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_SERVICE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > > - SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > > - SAL_CALL getOptionalServices() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getOptionalServices() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceTypeDescription > > - SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceTypeDescription > > - SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XPropertyTypeDescription > > - SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isSingleInterfaceBased() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return false; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getInterface() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getInterface() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::reflection::XTypeDescription >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceConstructorDescription > > - SAL_CALL getConstructors() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getConstructors() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< @@ -1592,25 +1592,25 @@ private: virtual ~InterfaceBasedSingletonDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_SINGLETON; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XServiceTypeDescription > - SAL_CALL getService() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getService() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::reflection::XServiceTypeDescription >(); } virtual sal_Bool SAL_CALL isInterfaceBased() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return true; } virtual css::uno::Reference< css::reflection::XTypeDescription > - SAL_CALL getInterface() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getInterface() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(entity_->getBase()); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1638,25 +1638,25 @@ private: virtual ~ServiceBasedSingletonDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_SINGLETON; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XServiceTypeDescription > - SAL_CALL getService() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getService() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::reflection::XServiceTypeDescription >( manager_->resolve(entity_->getBase()), css::uno::UNO_QUERY_THROW); } virtual sal_Bool SAL_CALL isInterfaceBased() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return false; } virtual css::uno::Reference< css::reflection::XTypeDescription > - SAL_CALL getInterface() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getInterface() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::reflection::XTypeDescription >(); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1684,19 +1684,19 @@ private: virtual ~Enumeration() {} virtual sal_Bool SAL_CALL hasMoreElements() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return !positions_.empty(); } virtual css::uno::Any SAL_CALL nextElement() throw ( css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { return css::uno::makeAny(nextTypeDescription()); } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL nextTypeDescription() throw ( - css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; bool matches(css::uno::TypeClass tc) const; |