diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /xmloff/source/xforms | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'xmloff/source/xforms')
-rw-r--r-- | xmloff/source/xforms/SchemaContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/xforms/SchemaRestrictionContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/xforms/SchemaSimpleTypeContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/xforms/TokenContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/xforms/XFormsBindContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/xforms/XFormsInstanceContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/xforms/XFormsModelContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/xforms/XFormsSubmissionContext.hxx | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx index 20c3eb6e6121..cd03695cc36a 100644 --- a/xmloff/source/xforms/SchemaContext.hxx +++ b/xmloff/source/xforms/SchemaContext.hxx @@ -42,7 +42,7 @@ public: sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference<css::xforms::XDataTypeRepository>& rRepository ); - virtual ~SchemaContext(); + virtual ~SchemaContext() override; // implement TokenContext methods: diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx index 0382714fc34e..d5808aa459b5 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.hxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx @@ -46,7 +46,7 @@ public: const OUString& rLName, css::uno::Reference<css::xforms::XDataTypeRepository>& rRepository, const OUString& sTypeName ); - virtual ~SchemaRestrictionContext(); + virtual ~SchemaRestrictionContext() override; protected: // create mxDataType (if not already present) diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx index 4f13868db99d..3ac9bf9a95ea 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx @@ -44,7 +44,7 @@ public: const OUString& rLName, const css::uno::Reference<css::xforms::XDataTypeRepository>& rRepository ); - virtual ~SchemaSimpleTypeContext(); + virtual ~SchemaSimpleTypeContext() override; // implement TokenContext methods: diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx index 2b7bbfffeebd..e813236787d4 100644 --- a/xmloff/source/xforms/TokenContext.hxx +++ b/xmloff/source/xforms/TokenContext.hxx @@ -47,7 +47,7 @@ public: const SvXMLTokenMapEntry* pAttributes = nullptr, const SvXMLTokenMapEntry* pChildren = nullptr ); - virtual ~TokenContext(); + virtual ~TokenContext() override; // implement SvXMLImportContext methods: diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx index a0e0b7468771..d5b962f10ce9 100644 --- a/xmloff/source/xforms/XFormsBindContext.hxx +++ b/xmloff/source/xforms/XFormsBindContext.hxx @@ -43,7 +43,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xforms::XModel2>& xModel ); - virtual ~XFormsBindContext(); + virtual ~XFormsBindContext() override; // implement SvXMLImportContext & TokenContext methods: diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx index 44dc04b7130d..76f0fa7df429 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.hxx +++ b/xmloff/source/xforms/XFormsInstanceContext.hxx @@ -46,7 +46,7 @@ public: sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference<css::xforms::XModel2> & xModel ); - virtual ~XFormsInstanceContext(); + virtual ~XFormsInstanceContext() override; // implement SvXMLImportContext & TokenContext methods: // We override CreateChildContext, because we want to read diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx index b71baad466c6..ca4b8379a3ce 100644 --- a/xmloff/source/xforms/XFormsModelContext.hxx +++ b/xmloff/source/xforms/XFormsModelContext.hxx @@ -41,7 +41,7 @@ public: XFormsModelContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName ); - virtual ~XFormsModelContext(); + virtual ~XFormsModelContext() override; const css::uno::Reference<css::xforms::XModel2>& getModel() { return mxModel;} diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx index a171ec834cf0..d93444f07ad4 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.hxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx @@ -42,7 +42,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xforms::XModel2>& xModel ); - virtual ~XFormsSubmissionContext(); + virtual ~XFormsSubmissionContext() override; // implement TokenContext methods: |