From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- xmloff/source/xforms/SchemaContext.hxx | 4 ++-- xmloff/source/xforms/SchemaRestrictionContext.hxx | 4 ++-- xmloff/source/xforms/SchemaSimpleTypeContext.hxx | 4 ++-- xmloff/source/xforms/TokenContext.hxx | 6 +++--- xmloff/source/xforms/XFormsBindContext.hxx | 6 +++--- xmloff/source/xforms/XFormsInstanceContext.hxx | 8 ++++---- xmloff/source/xforms/XFormsModelContext.hxx | 6 +++--- xmloff/source/xforms/XFormsSubmissionContext.hxx | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) (limited to 'xmloff/source/xforms') diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx index ee5574cbdb42..7baa5c6840d8 100644 --- a/xmloff/source/xforms/SchemaContext.hxx +++ b/xmloff/source/xforms/SchemaContext.hxx @@ -49,13 +49,13 @@ public: protected: virtual void HandleAttribute( sal_uInt16 nToken, - const OUString& rValue ) SAL_OVERRIDE; + const OUString& rValue ) override; virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference& xAttrList ) override; }; #endif diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx index 04541cfa0048..6bbb7a4e67aa 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.hxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx @@ -56,13 +56,13 @@ protected: virtual void HandleAttribute( sal_uInt16 nToken, - const OUString& rValue ) SAL_OVERRIDE; + const OUString& rValue ) override; virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference& xAttrList ) override; }; #endif diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx index 3d0a3909298b..ea89b39ed837 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx @@ -51,13 +51,13 @@ public: protected: virtual void HandleAttribute( sal_uInt16 nToken, - const OUString& rValue ) SAL_OVERRIDE; + const OUString& rValue ) override; virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference& xAttrList ) override; }; #endif diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx index 3357736308f1..b7bed1b64d40 100644 --- a/xmloff/source/xforms/TokenContext.hxx +++ b/xmloff/source/xforms/TokenContext.hxx @@ -55,7 +55,7 @@ public: * create a warning for all others. Classes that wish to override * StartElement need to call the parent method. */ virtual void StartElement( - const com::sun::star::uno::Reference& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference& xAttrList ) override; /** call HandleChild for each child element in the token map; * create a warning for all others. Classes that wish to override @@ -64,13 +64,13 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference& xAttrList ) override; /** Create a warning for all non-namespace character * content. Classes that wish to deal with character content have * to override this method anyway, and will thus get rid of the * warnings. */ - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; protected: /** will be called for each attribute */ diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx index a00d8c200159..8bda8309ad89 100644 --- a/xmloff/source/xforms/XFormsBindContext.hxx +++ b/xmloff/source/xforms/XFormsBindContext.hxx @@ -48,17 +48,17 @@ public: // implement SvXMLImportContext & TokenContext methods: virtual void StartElement( - const com::sun::star::uno::Reference& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference& xAttrList ) override; protected: virtual void HandleAttribute( sal_uInt16 nToken, - const OUString& rValue ) SAL_OVERRIDE; + const OUString& rValue ) override; virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nNamespace, const OUString& rLocalName, - const com::sun::star::uno::Reference& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference& xAttrList ) override; }; diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx index 64a76634adc3..6c480bac1f49 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.hxx +++ b/xmloff/source/xforms/XFormsInstanceContext.hxx @@ -56,20 +56,20 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; protected: virtual void HandleAttribute( sal_uInt16 nToken, - const OUString& rValue ) SAL_OVERRIDE; + const OUString& rValue ) override; virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nNamespace, const OUString& rLocalName, - const com::sun::star::uno::Reference& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference& xAttrList ) override; }; #endif diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx index 4247f02fac22..fc8e04be6dd0 100644 --- a/xmloff/source/xforms/XFormsModelContext.hxx +++ b/xmloff/source/xforms/XFormsModelContext.hxx @@ -47,18 +47,18 @@ public: // implement SvXMLImportContext & TokenContext methods: - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; protected: virtual void HandleAttribute( sal_uInt16 nToken, - const OUString& rValue ) SAL_OVERRIDE; + const OUString& rValue ) override; virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference& xAttrList ) override; }; #endif diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx index 0457f3aa78ed..a570ab56e887 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.hxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx @@ -48,13 +48,13 @@ public: protected: virtual void HandleAttribute( sal_uInt16 nToken, - const OUString& rValue ) SAL_OVERRIDE; + const OUString& rValue ) override; virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nNamespace, const OUString& rLocalName, - const com::sun::star::uno::Reference& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference& xAttrList ) override; }; -- cgit