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/draw/ximpshap.hxx | |
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/draw/ximpshap.hxx')
-rw-r--r-- | xmloff/source/draw/ximpshap.hxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index a6ce95d8fce0..540abd3bcb64 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -107,7 +107,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); - virtual ~SdXMLShapeContext(); + virtual ~SdXMLShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; @@ -136,7 +136,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); - virtual ~SdXMLRectShapeContext(); + virtual ~SdXMLRectShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -159,7 +159,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); - virtual ~SdXMLLineShapeContext(); + virtual ~SdXMLLineShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -185,7 +185,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); - virtual ~SdXMLEllipseShapeContext(); + virtual ~SdXMLEllipseShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -206,7 +206,7 @@ public: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes, bool bClosed, bool bTemporaryShape); - virtual ~SdXMLPolygonShapeContext(); + virtual ~SdXMLPolygonShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -227,7 +227,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); - virtual ~SdXMLPathShapeContext(); + virtual ~SdXMLPathShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -247,7 +247,7 @@ public: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes); - virtual ~SdXMLTextBoxShapeContext(); + virtual ~SdXMLTextBoxShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -268,7 +268,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); - virtual ~SdXMLControlShapeContext(); + virtual ~SdXMLControlShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -303,7 +303,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); - virtual ~SdXMLConnectorShapeContext(); + virtual ~SdXMLConnectorShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -325,7 +325,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); - virtual ~SdXMLMeasureShapeContext(); + virtual ~SdXMLMeasureShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; @@ -346,7 +346,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); - virtual ~SdXMLPageShapeContext(); + virtual ~SdXMLPageShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -368,7 +368,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); - virtual ~SdXMLCaptionShapeContext(); + virtual ~SdXMLCaptionShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -389,7 +389,7 @@ public: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes); - virtual ~SdXMLGraphicObjectShapeContext(); + virtual ~SdXMLGraphicObjectShapeContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; @@ -437,7 +437,7 @@ public: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes); - virtual ~SdXMLObjectShapeContext(); + virtual ~SdXMLObjectShapeContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; @@ -467,7 +467,7 @@ public: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes); - virtual ~SdXMLAppletShapeContext(); + virtual ~SdXMLAppletShapeContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; @@ -496,7 +496,7 @@ public: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes); - virtual ~SdXMLPluginShapeContext(); + virtual ~SdXMLPluginShapeContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; @@ -526,7 +526,7 @@ public: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes); - virtual ~SdXMLFloatingFrameShapeContext(); + virtual ~SdXMLFloatingFrameShapeContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; @@ -556,7 +556,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); - virtual ~SdXMLFrameShapeContext(); + virtual ~SdXMLFrameShapeContext() override; virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; @@ -583,7 +583,7 @@ public: SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes); - virtual ~SdXMLCustomShapeContext(); + virtual ~SdXMLCustomShapeContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; @@ -605,7 +605,7 @@ public: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes ); - virtual ~SdXMLTableShapeContext(); + virtual ~SdXMLTableShapeContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; |