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 --- filter/source/config/cache/basecontainer.hxx | 2 +- filter/source/config/cache/cacheupdatelistener.hxx | 2 +- filter/source/config/cache/configflush.hxx | 2 +- filter/source/config/cache/contenthandlerfactory.hxx | 2 +- filter/source/config/cache/filterfactory.hxx | 2 +- filter/source/config/cache/frameloaderfactory.hxx | 2 +- filter/source/config/cache/typedetection.hxx | 2 +- filter/source/flash/impswfdialog.hxx | 2 +- filter/source/flash/swfdialog.hxx | 2 +- filter/source/graphic/GraphicExportDialog.hxx | 2 +- filter/source/graphic/GraphicExportFilter.hxx | 2 +- filter/source/graphicfilter/icgm/bundles.hxx | 4 ++-- filter/source/graphicfilter/idxf/dxfentrd.hxx | 12 ++++++------ filter/source/msfilter/escherex.cxx | 2 +- filter/source/pdf/impdialog.hxx | 16 ++++++++-------- filter/source/pdf/pdfdialog.hxx | 2 +- filter/source/pdf/pdfexport.cxx | 2 +- filter/source/pdf/pdffilter.hxx | 2 +- filter/source/pdf/pdfinteract.hxx | 2 +- filter/source/storagefilterdetect/filterdetect.hxx | 2 +- filter/source/svg/impsvgdialog.hxx | 2 +- filter/source/svg/svgdialog.hxx | 2 +- filter/source/svg/svgexport.cxx | 10 +++++----- filter/source/svg/svgfilter.hxx | 4 ++-- filter/source/svg/svgwriter.hxx | 2 +- filter/source/t602/t602filter.hxx | 4 ++-- filter/source/textfilterdetect/filterdetect.hxx | 2 +- filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx | 2 +- filter/source/xmlfilterdetect/filterdetect.hxx | 2 +- filter/source/xsltdialog/typedetectionimport.hxx | 2 +- filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 2 +- filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 6 +++--- filter/source/xsltdialog/xmlfiltertabdialog.hxx | 2 +- filter/source/xsltdialog/xmlfiltertabpagebasic.hxx | 2 +- filter/source/xsltdialog/xmlfiltertabpagexslt.hxx | 2 +- filter/source/xsltdialog/xmlfiltertestdialog.hxx | 2 +- filter/source/xsltfilter/LibXSLTTransformer.hxx | 4 ++-- 37 files changed, 59 insertions(+), 59 deletions(-) (limited to 'filter') diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index 95589b2b9abb..2d5d4595530c 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -121,7 +121,7 @@ class BaseContainer : public BaseLock /** @short standard dtor. */ - virtual ~BaseContainer(); + virtual ~BaseContainer() override; /** @short initialize this generic intsnace with some specialized values diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx index babc0aebd4a2..17e4db5831de 100644 --- a/filter/source/config/cache/cacheupdatelistener.hxx +++ b/filter/source/config/cache/cacheupdatelistener.hxx @@ -83,7 +83,7 @@ class CacheUpdateListener : public BaseLock // must be the first one to guarante /** @short standard dtor. */ - virtual ~CacheUpdateListener(); + virtual ~CacheUpdateListener() override; /** @short starts listening. diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index 62ac5ed71732..0239334c8023 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -66,7 +66,7 @@ class ConfigFlush : public BaseLock /** @short standard dtor. */ - virtual ~ConfigFlush(); + virtual ~ConfigFlush() override; // uno interface diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index 89e9077062c3..eebd5b52eb0e 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -56,7 +56,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine /** @short standard dtor. */ - virtual ~ContentHandlerFactory(); + virtual ~ContentHandlerFactory() override; // uno interface diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index 0e9f7d8ef50f..8007f85235ff 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -57,7 +57,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer /** @short standard dtor. */ - virtual ~FilterFactory(); + virtual ~FilterFactory() override; // uno interface diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index eb7e506eb7d6..39772ad3f994 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -56,7 +56,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer /** @short standard dtor. */ - virtual ~FrameLoaderFactory(); + virtual ~FrameLoaderFactory() override; // uno interface diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index 548a14343925..a0c6bc818fa8 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -56,7 +56,7 @@ public: /** @short standard dtor. */ - virtual ~TypeDetection(); + virtual ~TypeDetection() override; // private helper diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx index 3cef0c180e0a..5d5f152902f0 100644 --- a/filter/source/flash/impswfdialog.hxx +++ b/filter/source/flash/impswfdialog.hxx @@ -55,7 +55,7 @@ private: public: ImpSWFDialog( vcl::Window* pParent, css::uno::Sequence< css::beans::PropertyValue >& rFilterData ); - virtual ~ImpSWFDialog(); + virtual ~ImpSWFDialog() override; virtual void dispose() override; css::uno::Sequence< css::beans::PropertyValue > GetFilterData(); diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index 50034d5a9369..f8a403d4ac92 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -70,7 +70,7 @@ protected: public: explicit SWFDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~SWFDialog(); + virtual ~SWFDialog() override; }; diff --git a/filter/source/graphic/GraphicExportDialog.hxx b/filter/source/graphic/GraphicExportDialog.hxx index 36869afac7f1..d6aead53f278 100644 --- a/filter/source/graphic/GraphicExportDialog.hxx +++ b/filter/source/graphic/GraphicExportDialog.hxx @@ -53,7 +53,7 @@ class GraphicExportDialog : public cppu::WeakImplHelper public: explicit GraphicExportDialog( const Reference& rxContext ); - virtual ~GraphicExportDialog(); + virtual ~GraphicExportDialog() override; // XInitialization virtual void SAL_CALL initialize( const Sequence& aArguments ) throw (Exception, RuntimeException, std::exception ) override; diff --git a/filter/source/graphic/GraphicExportFilter.hxx b/filter/source/graphic/GraphicExportFilter.hxx index b0ae945d0e53..d998befe99ef 100644 --- a/filter/source/graphic/GraphicExportFilter.hxx +++ b/filter/source/graphic/GraphicExportFilter.hxx @@ -56,7 +56,7 @@ class GraphicExportFilter : public: explicit GraphicExportFilter( const Reference& rxContext ); - virtual ~GraphicExportFilter(); + virtual ~GraphicExportFilter() override; // XFilter virtual sal_Bool SAL_CALL filter( const Sequence& rDescriptor ) throw(RuntimeException, std::exception) override; diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx index abb8e0419c01..929c92677de7 100644 --- a/filter/source/graphicfilter/icgm/bundles.hxx +++ b/filter/source/graphicfilter/icgm/bundles.hxx @@ -81,7 +81,7 @@ public: virtual Bundle* Clone() override { return new MarkerBundle( *this ); } ; MarkerBundle& operator=( const MarkerBundle& rMarkerBundle ); - virtual ~MarkerBundle() {}; + virtual ~MarkerBundle() override {}; }; @@ -119,7 +119,7 @@ public: virtual Bundle* Clone() override { return new TextBundle( *this ); } ; TextBundle& operator=( const TextBundle& rTextBundle ); - virtual ~TextBundle() {}; + virtual ~TextBundle() override {}; }; diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx index 2258c6c3da51..63b69b86eb46 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.hxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx @@ -334,7 +334,7 @@ class DXFLWPolyLineEntity : public DXFBasicEntity DXFVector* pP; DXFLWPolyLineEntity(); - virtual ~DXFLWPolyLineEntity(); + virtual ~DXFLWPolyLineEntity() override; protected: @@ -358,7 +358,7 @@ struct DXFEdgeTypeLine : public DXFEdgeType DXFVector aStartPoint; // 10,20 DXFVector aEndPoint; // 11,21 DXFEdgeTypeLine(); - virtual ~DXFEdgeTypeLine(); + virtual ~DXFEdgeTypeLine() override; virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; struct DXFEdgeTypeCircularArc : public DXFEdgeType @@ -369,7 +369,7 @@ struct DXFEdgeTypeCircularArc : public DXFEdgeType double fEndAngle; // 51 sal_Int32 nIsCounterClockwiseFlag; // 73 DXFEdgeTypeCircularArc(); - virtual ~DXFEdgeTypeCircularArc(); + virtual ~DXFEdgeTypeCircularArc() override; virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; struct DXFEdgeTypeEllipticalArc : public DXFEdgeType @@ -382,7 +382,7 @@ struct DXFEdgeTypeEllipticalArc : public DXFEdgeType sal_Int32 nIsCounterClockwiseFlag; // 73 DXFEdgeTypeEllipticalArc(); - virtual ~DXFEdgeTypeEllipticalArc(); + virtual ~DXFEdgeTypeEllipticalArc() override; virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; struct DXFEdgeTypeSpline : public DXFEdgeType @@ -394,7 +394,7 @@ struct DXFEdgeTypeSpline : public DXFEdgeType sal_Int32 nControlCount; // 76 DXFEdgeTypeSpline(); - virtual ~DXFEdgeTypeSpline(); + virtual ~DXFEdgeTypeSpline() override; virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; @@ -443,7 +443,7 @@ class DXFHatchEntity : public DXFBasicEntity DXFBoundaryPathData* pBoundaryPathData; DXFHatchEntity(); - virtual ~DXFHatchEntity(); + virtual ~DXFHatchEntity() override; protected: diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 148b15854302..f204391cf1bb 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -4954,7 +4954,7 @@ protected: public: SvNullStream() : SvStream() {} - virtual ~SvNullStream() {} + virtual ~SvNullStream() override {} }; EscherEx::EscherEx(const std::shared_ptr& rxGlobal, SvStream* pOutStrm, bool bOOXML) diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index 99e9a0fb3d81..62c9ea373265 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -62,7 +62,7 @@ private: public: explicit ImplErrorDialog( const std::set< vcl::PDFWriter::ErrorCode >& ); - virtual ~ImplErrorDialog(); + virtual ~ImplErrorDialog() override; virtual void dispose() override; }; @@ -173,7 +173,7 @@ public: ImpPDFTabDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFilterData, const css::uno::Reference< XComponent >& rDoc); - virtual ~ImpPDFTabDialog(); + virtual ~ImpPDFTabDialog() override; virtual void dispose() override; @@ -253,7 +253,7 @@ public: DECL_LINK_TYPED( ToggleExportPDFAHdl, CheckBox&, void ); ImpPDFTabGeneralPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~ImpPDFTabGeneralPage(); + virtual ~ImpPDFTabGeneralPage() override; virtual void dispose() override; static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -293,7 +293,7 @@ class ImpPDFTabOpnFtrPage : public SfxTabPage public: ImpPDFTabOpnFtrPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~ImpPDFTabOpnFtrPage(); + virtual ~ImpPDFTabOpnFtrPage() override; virtual void dispose() override; static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); @@ -326,7 +326,7 @@ class ImpPDFTabViewerPage : public SfxTabPage public: ImpPDFTabViewerPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~ImpPDFTabViewerPage(); + virtual ~ImpPDFTabViewerPage() override; virtual void dispose() override; static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); @@ -380,7 +380,7 @@ class ImpPDFTabSecurityPage : public SfxTabPage public: ImpPDFTabSecurityPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~ImpPDFTabSecurityPage(); + virtual ~ImpPDFTabSecurityPage() override; virtual void dispose() override; static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); @@ -411,7 +411,7 @@ class ImpPDFTabLinksPage : public SfxTabPage public: ImpPDFTabLinksPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~ImpPDFTabLinksPage(); + virtual ~ImpPDFTabLinksPage() override; virtual void dispose() override; static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); @@ -440,7 +440,7 @@ class ImpPDFTabSigningPage : public SfxTabPage public: ImpPDFTabSigningPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~ImpPDFTabSigningPage(); + virtual ~ImpPDFTabSigningPage() override; virtual void dispose() override; static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index 70ed93cac052..b20cd4cd65a7 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -62,7 +62,7 @@ protected: public: explicit PDFDialog( const Reference< XComponentContext >& rxContext ); - virtual ~PDFDialog(); + virtual ~PDFDialog() override; }; diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 6e4d644ef950..14840bd92f3c 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -264,7 +264,7 @@ public: : m_xSrcDoc( xDoc ), m_aPreparedPassword( rPwd ) {} - virtual ~PDFExportStreamDoc(); + virtual ~PDFExportStreamDoc() override; virtual void write( const Reference< XOutputStream >& xStream ) override; }; diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx index 90cb749d371f..3c93d8a7a675 100644 --- a/filter/source/pdf/pdffilter.hxx +++ b/filter/source/pdf/pdffilter.hxx @@ -78,7 +78,7 @@ protected: public: explicit PDFFilter( const Reference< XComponentContext >& rxContext ); - virtual ~PDFFilter(); + virtual ~PDFFilter() override; }; diff --git a/filter/source/pdf/pdfinteract.hxx b/filter/source/pdf/pdfinteract.hxx index fe4a600260c5..8968c77e5db8 100644 --- a/filter/source/pdf/pdfinteract.hxx +++ b/filter/source/pdf/pdfinteract.hxx @@ -49,7 +49,7 @@ protected: public: PDFInteractionHandler(); - virtual ~PDFInteractionHandler(); + virtual ~PDFInteractionHandler() override; }; diff --git a/filter/source/storagefilterdetect/filterdetect.hxx b/filter/source/storagefilterdetect/filterdetect.hxx index fa026aa62b03..af2c7c53d7e3 100644 --- a/filter/source/storagefilterdetect/filterdetect.hxx +++ b/filter/source/storagefilterdetect/filterdetect.hxx @@ -37,7 +37,7 @@ class StorageFilterDetect : public cppu::WeakImplHelper< public: explicit StorageFilterDetect (const css::uno::Reference& xCxt); - virtual ~StorageFilterDetect(); + virtual ~StorageFilterDetect() override; // XExtendedFilterDetection virtual OUString SAL_CALL detect(css::uno::Sequence& rDescriptor) diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx index d3a7b31f42bc..3bb35e98bee5 100644 --- a/filter/source/svg/impsvgdialog.hxx +++ b/filter/source/svg/impsvgdialog.hxx @@ -64,7 +64,7 @@ public: ImpSVGDialog( vcl::Window* pParent, /*ResMgr& rResMgr,*/ css::uno::Sequence< css::beans::PropertyValue >& rFilterData ); - virtual ~ImpSVGDialog(); + virtual ~ImpSVGDialog() override; virtual void dispose() override; css::uno::Sequence< css::beans::PropertyValue > GetFilterData(); diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 0dad0f74ad19..24f80de25c69 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -70,7 +70,7 @@ protected: public: explicit SVGDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~SVGDialog(); + virtual ~SVGDialog() override; }; diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 715f25b3037e..9c9ac5fadc13 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -163,7 +163,7 @@ public: SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", true, true ); pSVGExport->GetDocHandler()->characters( text ); } - virtual ~FixedTextField() {} + virtual ~FixedTextField() override {} }; @@ -179,7 +179,7 @@ public: { implGrowCharSet( aTextFieldCharSets, text, aOOOAttrDateTimeField ); } - virtual ~FixedDateTimeField() {} + virtual ~FixedDateTimeField() override {} }; @@ -196,7 +196,7 @@ public: static const OUString sFieldId = aOOOAttrFooterField; implGrowCharSet( aTextFieldCharSets, text, sFieldId ); } - virtual ~FooterField() {} + virtual ~FooterField() override {} }; @@ -207,7 +207,7 @@ public: { return OUString( "VariableTextField" ); } - virtual ~VariableTextField() {} + virtual ~VariableTextField() override {} }; @@ -306,7 +306,7 @@ public: aTextFieldCharSets[ *aMasterPageIt ][ sFieldId ].insert( (sal_Unicode)( format ) ); } } - virtual ~VariableDateTimeField() {} + virtual ~VariableDateTimeField() override {} }; diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index f99e79ec4bda..447bf77921bc 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -99,7 +99,7 @@ public: const Reference< XDocumentHandler >& rxHandler, const Sequence< PropertyValue >& rFilterData ); - virtual ~SVGExport(); + virtual ~SVGExport() override; bool IsUseTinyProfile() const { return mbIsUseTinyProfile; }; bool IsEmbedFonts() const { return mbIsEmbedFonts; }; @@ -304,7 +304,7 @@ protected: public: explicit SVGFilter( const Reference< XComponentContext >& rxCtx ); - virtual ~SVGFilter(); + virtual ~SVGFilter() override; }; #endif // INCLUDED_FILTER_SOURCE_SVG_SVGFILTER_HXX diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 74cda8a7bee7..0ea1c7cca727 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -398,7 +398,7 @@ private: public: explicit SVGWriter( const Sequence& args, const Reference< XComponentContext >& rxCtx ); - virtual ~SVGWriter(); + virtual ~SVGWriter() override; // XSVGWriter virtual void SAL_CALL write( const Reference& rxDocHandler, diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index 631e6e1b77a5..f9ccc0526af0 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -102,7 +102,7 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper < OUString getResStr( sal_Int16 resid ); void initLocale(); - virtual ~T602ImportFilterDialog(); + virtual ~T602ImportFilterDialog() override; // XExecutableDialog virtual void SAL_CALL setTitle( const OUString& aTitle ) @@ -254,7 +254,7 @@ private: public: explicit T602ImportFilter(const css::uno::Reference &r ); explicit T602ImportFilter(css::uno::Reference const & xInputStream); - virtual ~T602ImportFilter(); + virtual ~T602ImportFilter() override; // XFilter virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx index 8ca373ea8125..cb8090c555ba 100644 --- a/filter/source/textfilterdetect/filterdetect.hxx +++ b/filter/source/textfilterdetect/filterdetect.hxx @@ -35,7 +35,7 @@ class PlainTextFilterDetect : public cppu::WeakImplHelper< public: PlainTextFilterDetect(); - virtual ~PlainTextFilterDetect(); + virtual ~PlainTextFilterDetect() override; // XExtendedFilterDetection diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx index 65f6d654c066..6bfde48082d2 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx @@ -75,7 +75,7 @@ public: { } - virtual ~XmlFilterAdaptor() {} + virtual ~XmlFilterAdaptor() override {} // XFilter diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx index 299f519ecb48..9f781582949c 100644 --- a/filter/source/xmlfilterdetect/filterdetect.hxx +++ b/filter/source/xmlfilterdetect/filterdetect.hxx @@ -43,7 +43,7 @@ public: explicit FilterDetect( const css::uno::Reference< css::uno::XComponentContext > &rxCtx) : mxCtx( rxCtx ) {} - virtual ~FilterDetect() {} + virtual ~FilterDetect() override {} //XExtendedFilterDetection virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx index ccdcd6d054c3..8118c2b7f6de 100644 --- a/filter/source/xsltdialog/typedetectionimport.hxx +++ b/filter/source/xsltdialog/typedetectionimport.hxx @@ -62,7 +62,7 @@ class TypeDetectionImporter : public cppu::WeakImplHelper < css::xml::sax::XDocu { public: TypeDetectionImporter(); - virtual ~TypeDetectionImporter(); + virtual ~TypeDetectionImporter() override; static void doImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference < css::io::XInputStream >& xOS, XMLFilterVector& rFilters ); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index abf579ef3b2f..2baa87a5b6c4 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -69,7 +69,7 @@ class XMLFilterDialogComponent : public XMLFilterDialogComponentBase, { public: explicit XMLFilterDialogComponent( const Reference< XComponentContext >& rxContext ); - virtual ~XMLFilterDialogComponent(); + virtual ~XMLFilterDialogComponent() override; protected: // XInterface diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 02b01823754d..ea40b64dd802 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -49,7 +49,7 @@ public: explicit SvxPathControl(vcl::Window* pParent); HeaderBar* getHeaderBar() { return m_pHeaderBar; } XMLFilterListBox* getListBox() { return m_pFocusCtrl; } - virtual ~SvxPathControl(); + virtual ~SvxPathControl() override; virtual void dispose() override; virtual bool Notify( NotifyEvent& rNEvt ) override; @@ -69,7 +69,7 @@ private: public: XMLFilterListBox(Window* pParent, SvxPathControl* pPathControl); - virtual ~XMLFilterListBox(); + virtual ~XMLFilterListBox() override; virtual void dispose() override; /** adds a new filter info entry to the ui filter list */ @@ -87,7 +87,7 @@ public: XMLFilterSettingsDialog(vcl::Window* pParent, const css::uno::Reference< css::uno::XComponentContext >& rxContext, Dialog::InitFlag eFlag = Dialog::InitFlag::Default); - virtual ~XMLFilterSettingsDialog(); + virtual ~XMLFilterSettingsDialog() override; virtual void dispose() override; DECL_LINK_TYPED(ClickHdl_Impl, Button *, void ); diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index 067a22ac9d22..7d164f0c1799 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -35,7 +35,7 @@ class XMLFilterTabDialog: public TabDialog { public: XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo); - virtual ~XMLFilterTabDialog(); + virtual ~XMLFilterTabDialog() override; virtual void dispose() override; bool onOk(); diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx index e5809faf5cd6..ce6e9fc20d48 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx @@ -33,7 +33,7 @@ class XMLFilterTabPageBasic : public TabPage { public: explicit XMLFilterTabPageBasic(vcl::Window* pParent); - virtual ~XMLFilterTabPageBasic(); + virtual ~XMLFilterTabPageBasic() override; virtual void dispose() override; void FillInfo( filter_info_impl* pInfo ); diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx index 7b0309c4c51d..880e5d530c4e 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx @@ -34,7 +34,7 @@ class XMLFilterTabPageXSLT : public TabPage { public: explicit XMLFilterTabPageXSLT(vcl::Window* pParent); - virtual ~XMLFilterTabPageXSLT(); + virtual ~XMLFilterTabPageXSLT() override; virtual void dispose() override; void FillInfo( filter_info_impl* pInfo ); diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx index 39261c4d07d8..7825dd24fe5a 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx @@ -36,7 +36,7 @@ class XMLFilterTestDialog : public ModalDialog public: XMLFilterTestDialog(vcl::Window* pParent, const css::uno::Reference< css::uno::XComponentContext >& rxContext); - virtual ~XMLFilterTestDialog(); + virtual ~XMLFilterTestDialog() override; virtual void dispose() override; void test( const filter_info_impl& rFilterInfo ); diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx index 9c4485bb28b2..87f3225c86b7 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.hxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx @@ -64,7 +64,7 @@ namespace XSLT int SAL_CALL closeOutput(); private: - virtual ~Reader(); + virtual ~Reader() override; static const sal_Int32 OUTPUT_BUFFER_SIZE; static const sal_Int32 INPUT_BUFFER_SIZE; @@ -118,7 +118,7 @@ namespace XSLT rtl::Reference m_Reader; protected: - virtual ~LibXSLTTransformer() { + virtual ~LibXSLTTransformer() override { if (m_Reader.is()) { m_Reader->terminate(); m_Reader->forceStateStopped(); -- cgit