From 91dd2db17bd6cb9b357d1d69b187174e31eabef0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 13 Sep 2016 13:09:01 +0200 Subject: 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 --- sw/source/filter/xml/wrtxml.hxx | 2 +- sw/source/filter/xml/xmlbrshi.hxx | 2 +- sw/source/filter/xml/xmlexp.hxx | 2 +- sw/source/filter/xml/xmlfmt.cxx | 8 ++++---- sw/source/filter/xml/xmlfmte.cxx | 2 +- sw/source/filter/xml/xmlimp.cxx | 10 +++++----- sw/source/filter/xml/xmlimp.hxx | 2 +- sw/source/filter/xml/xmlitem.hxx | 2 +- sw/source/filter/xml/xmliteme.cxx | 2 +- sw/source/filter/xml/xmlitemi.cxx | 4 ++-- sw/source/filter/xml/xmlitmap.hxx | 2 +- sw/source/filter/xml/xmltbli.cxx | 12 ++++++------ sw/source/filter/xml/xmltbli.hxx | 2 +- sw/source/filter/xml/xmltext.cxx | 2 +- sw/source/filter/xml/xmltexte.hxx | 2 +- sw/source/filter/xml/xmltexti.hxx | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) (limited to 'sw/source/filter/xml') diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index 7bae60a0cd3b..913e3b846c3d 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -49,7 +49,7 @@ protected: public: SwXMLWriter( const OUString& rBaseURL ); - virtual ~SwXMLWriter(); + virtual ~SwXMLWriter() override; virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* ) override; diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx index 56fef7456e51..7a507ddc5902 100644 --- a/sw/source/filter/xml/xmlbrshi.hxx +++ b/sw/source/filter/xml/xmlbrshi.hxx @@ -60,7 +60,7 @@ public: const SvXMLUnitConverter& rUnitConv, sal_uInt16 nWhich ); - virtual ~SwXMLBrushItemImportContext(); + virtual ~SwXMLBrushItemImportContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index 0469227db681..b08682d961b5 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -113,7 +113,7 @@ public: const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLExportFlags nExportFlags); - virtual ~SwXMLExport(); + virtual ~SwXMLExport() override; virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override; diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 09920b1e4398..7b963963ae6a 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -203,7 +203,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ); - virtual ~SwXMLConditionContext_Impl(); + virtual ~SwXMLConditionContext_Impl() override; bool IsValid() const { return 0 != nCondition; } @@ -425,7 +425,7 @@ public: const uno::Reference< xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStylesC, sal_uInt16 nFamily); - virtual ~SwXMLItemSetStyleContext_Impl(); + virtual ~SwXMLItemSetStyleContext_Impl() override; virtual void CreateAndInsert( bool bOverwrite ) override; @@ -713,7 +713,7 @@ public: const OUString& rLName , const uno::Reference< xml::sax::XAttributeList > & xAttrList, bool bAuto ); - virtual ~SwXMLStylesContext_Impl(); + virtual ~SwXMLStylesContext_Impl() override; virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override; @@ -921,7 +921,7 @@ public: SwXMLImport& rImport, const OUString& rLName , const uno::Reference< xml::sax::XAttributeList > & xAttrList ); - virtual ~SwXMLMasterStylesContext_Impl(); + virtual ~SwXMLMasterStylesContext_Impl() override; virtual void EndElement() override; }; diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index f019c04ada59..7bc0c33081df 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -266,7 +266,7 @@ protected: public: explicit SwXMLAutoStylePoolP( SvXMLExport& rExport ); - virtual ~SwXMLAutoStylePoolP(); + virtual ~SwXMLAutoStylePoolP() override; }; void SwXMLAutoStylePoolP::exportStyleAttributes( diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index b76d6788365f..341154e71b82 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -125,7 +125,7 @@ public: SwXMLBodyContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList ); - virtual ~SwXMLBodyContext_Impl(); + virtual ~SwXMLBodyContext_Impl() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, @@ -168,7 +168,7 @@ public: SwXMLDocContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList ); - virtual ~SwXMLDocContext_Impl(); + virtual ~SwXMLDocContext_Impl() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, @@ -256,7 +256,7 @@ public: const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList, const Reference< document::XDocumentProperties >& xDocProps); - virtual ~SwXMLOfficeDocContext_Impl(); + virtual ~SwXMLOfficeDocContext_Impl() override; virtual SvXMLImportContext *CreateChildContext( @@ -318,7 +318,7 @@ public: sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList ); - virtual ~SwXMLDocStylesContext_Impl(); + virtual ~SwXMLDocStylesContext_Impl() override; virtual void EndElement() override; @@ -941,7 +941,7 @@ class SvTextShapeImportHelper : public XMLTextShapeImportHelper public: explicit SvTextShapeImportHelper(SvXMLImport& rImp); - virtual ~SvTextShapeImportHelper(); + virtual ~SvTextShapeImportHelper() override; }; SvTextShapeImportHelper::SvTextShapeImportHelper(SvXMLImport& rImp) : diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 4d202791a9d7..17a54b99ab9f 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -119,7 +119,7 @@ public: const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLImportFlags nImportFlags); - virtual ~SwXMLImport() throw(); + virtual ~SwXMLImport() throw() override; // css::xml::sax::XDocumentHandler virtual void SAL_CALL startDocument() diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx index b927d0427235..34276bee4538 100644 --- a/sw/source/filter/xml/xmlitem.hxx +++ b/sw/source/filter/xml/xmlitem.hxx @@ -46,7 +46,7 @@ public: SvXMLImportItemMapper& rIMap, const SvXMLUnitConverter& rUnitConv ); - virtual ~SvXMLItemSetContext(); + virtual ~SvXMLItemSetContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index 04c1fad8b193..482ef650df05 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -68,7 +68,7 @@ public: SvXMLItemMapEntriesRef rMapEntries, SwXMLExport& rExp ); - virtual ~SwXMLTableItemMapper_Impl(); + virtual ~SwXMLTableItemMapper_Impl() override; virtual void handleSpecialItem( SvXMLAttributeList& rAttrList, const SvXMLItemMapEntry& rEntry, diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index 97d7962fcf4c..42c26d2d391f 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -63,7 +63,7 @@ class SwXMLImportTableItemMapper_Impl: public SvXMLImportItemMapper public: explicit SwXMLImportTableItemMapper_Impl(SvXMLItemMapEntriesRef rMapEntries); - virtual ~SwXMLImportTableItemMapper_Impl(); + virtual ~SwXMLImportTableItemMapper_Impl() override; virtual bool handleSpecialItem( const SvXMLItemMapEntry& rEntry, SfxPoolItem& rItem, @@ -254,7 +254,7 @@ public: SfxItemSet& rItemSet, SvXMLImportItemMapper & rIMapper, const SvXMLUnitConverter& rUnitConv ); - virtual ~SwXMLItemSetContext_Impl(); + virtual ~SwXMLItemSetContext_Impl() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx index 53f48c566a9d..abba74e887c5 100644 --- a/sw/source/filter/xml/xmlitmap.hxx +++ b/sw/source/filter/xml/xmlitmap.hxx @@ -63,7 +63,7 @@ protected: public: explicit SvXMLItemMapEntries(SvXMLItemMapEntry* pEntrys); - virtual ~SvXMLItemMapEntries(); + virtual ~SvXMLItemMapEntries() override; SvXMLItemMapEntry* getByName( sal_uInt16 nNameSpace, const OUString& rString ) const; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index ea99b369ac24..57e1bd635fbd 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -427,7 +427,7 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList, SwXMLTableContext *pTable ); - virtual ~SwXMLTableCellContext_Impl(); + virtual ~SwXMLTableCellContext_Impl() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -747,7 +747,7 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList, SwXMLTableContext *pTable ); - virtual ~SwXMLTableColContext_Impl(); + virtual ~SwXMLTableColContext_Impl() override; SwXMLImport& GetSwImport() { return static_cast(GetImport()); } }; @@ -833,7 +833,7 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList, SwXMLTableContext *pTable ); - virtual ~SwXMLTableColsContext_Impl(); + virtual ~SwXMLTableColsContext_Impl() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -890,7 +890,7 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList, SwXMLTableContext *pTable, bool bInHead=false ); - virtual ~SwXMLTableRowContext_Impl(); + virtual ~SwXMLTableRowContext_Impl() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -1011,7 +1011,7 @@ public: SwXMLTableContext *pTable, bool bHead ); - virtual ~SwXMLTableRowsContext_Impl(); + virtual ~SwXMLTableRowsContext_Impl() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -1071,7 +1071,7 @@ public: SwXMLDDETableContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName); - virtual ~SwXMLDDETableContext_Impl(); + virtual ~SwXMLDDETableContext_Impl() override; virtual void StartElement( const Reference & xAttrList) override; diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index d05002253c04..da26c301be68 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -137,7 +137,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, SwXMLTableContext *pTable ); - virtual ~SwXMLTableContext(); + virtual ~SwXMLTableContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index 58fea1d5a9a9..8b4e15e36e6a 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -31,7 +31,7 @@ class SwXMLBodyContentContext_Impl : public SvXMLImportContext public: SwXMLBodyContentContext_Impl( SwXMLImport& rImport, const OUString& rLName ); - virtual ~SwXMLBodyContentContext_Impl(); + virtual ~SwXMLBodyContentContext_Impl() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index e714994fbf38..9f4ab283574e 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -60,7 +60,7 @@ public: SwXMLTextParagraphExport( SwXMLExport& rExp, SvXMLAutoStylePoolP& rAutoStylePool ); - virtual ~SwXMLTextParagraphExport(); + virtual ~SwXMLTextParagraphExport() override; }; #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTE_HXX diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 327bc42f4751..f4ae970673aa 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -42,7 +42,7 @@ public: bool bInsertM, bool bStylesOnlyM, bool bBlockM, bool bOrganizerM, bool bPreserveRedlineFlags ); - virtual ~SwXMLTextImportHelper(); + virtual ~SwXMLTextImportHelper() override; virtual css::uno::Reference createAndInsertOLEObject( SvXMLImport& rImport, -- cgit v1.2.3