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

36 files changed, 65 insertions, 65 deletions

diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 6ea1e33d7286..cd862d256617 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -65,7 +65,7 @@ private:
 
 public:
     explicit BorderHandler( bool bOOXML );
-    virtual ~BorderHandler();
+    virtual ~BorderHandler() override;
 
     ::std::shared_ptr<PropertyMap>            getProperties();
     css::table::BorderLine2 getBorderLine();
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx
index 98c8aaf18ddf..a239c203fca3 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -51,7 +51,7 @@ private:
 
 public:
     CellColorHandler( );
-    virtual ~CellColorHandler();
+    virtual ~CellColorHandler() override;
 
     ::std::shared_ptr<TablePropertyMap>            getProperties();
 
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx
index a33f92d64b4d..b31e9cdf47a6 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -56,7 +56,7 @@ public:
 
 public:
     CellMarginHandler( );
-    virtual ~CellMarginHandler();
+    virtual ~CellMarginHandler() override;
 
     void enableInteropGrabBag(const OUString& aName);
     css::beans::PropertyValue getInteropGrabBag();
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx
index 2abaf1233656..54b12a1a2233 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -82,7 +82,7 @@ public:
                  bool bRepairStorage,
                  SourceDocumentType eDocumentType,
                  utl::MediaDescriptor& rMediaDesc);
-    virtual ~DomainMapper();
+    virtual ~DomainMapper() override;
 
     // Stream
     virtual void markLastParagraphInSection() override;
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index c4e8d638794d..11e1a7b782cc 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -80,7 +80,7 @@ class DomainMapperTableManager : public TableManager
 public:
 
     DomainMapperTableManager();
-    virtual ~DomainMapperTableManager();
+    virtual ~DomainMapperTableManager() override;
 
     // use this method to avoid adding the properties for the table
     // but in the provided properties map.
diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx
index a2149e9c7727..3ec35292549f 100644
--- a/writerfilter/source/dmapper/FFDataHandler.hxx
+++ b/writerfilter/source/dmapper/FFDataHandler.hxx
@@ -33,7 +33,7 @@ public:
     // constructor
     FFDataHandler();
     // destructor
-    virtual ~FFDataHandler();
+    virtual ~FFDataHandler() override;
 
     // member: name
     const OUString & getName() const { return m_sName;}
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index 32ead8865dad..0c1e689df8cc 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -50,7 +50,7 @@ class FontTable : public LoggedProperties, public LoggedTable
 
  public:
     FontTable();
-    virtual ~FontTable();
+    virtual ~FontTable() override;
 
     sal_uInt32          size();
     const FontEntry::Pointer_t  getFontEntry(sal_uInt32 nIndex);
@@ -89,7 +89,7 @@ class EmbeddedFontHandler : public LoggedProperties
 {
 public:
     EmbeddedFontHandler( const OUString& fontName, const char* style );
-    virtual ~EmbeddedFontHandler();
+    virtual ~EmbeddedFontHandler() override;
 private:
     virtual void lcl_attribute( Id name, Value& val ) override;
     virtual void lcl_sprm( Sprm& rSprm ) override;
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx
index a1ca90990bfd..0911992a4d73 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -34,7 +34,7 @@ class PositionHandler: public LoggedProperties
 {
 public:
     PositionHandler( std::pair<OUString, OUString>& rPositionOffsets, std::pair<OUString, OUString>& rAligns );
-    virtual ~PositionHandler( );
+    virtual ~PositionHandler( ) override;
     sal_Int16 orientation() const;
     sal_Int16 relation() const { return m_nRelation;}
     sal_Int32 position() const { return m_nPosition;}
@@ -53,7 +53,7 @@ class WrapHandler: public LoggedProperties
 {
 public:
     WrapHandler( );
-    virtual ~WrapHandler( );
+    virtual ~WrapHandler( ) override;
 
     sal_Int32 m_nType;
     sal_Int32 m_nSide;
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 006c91c44489..837308cc9659 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -80,7 +80,7 @@ class XInputStreamHelper : public cppu::WeakImplHelper<io::XInputStream>
     sal_Int32        m_nHeaderLength;
 public:
     XInputStreamHelper(const sal_uInt8* buf, size_t len);
-    virtual ~XInputStreamHelper();
+    virtual ~XInputStreamHelper() override;
 
     virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
     virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index deb738366a0d..9b0246e79581 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -85,7 +85,7 @@ public:
                             std::pair<OUString, OUString>& rPositionOffsets,
                             std::pair<OUString, OUString>& rAligns,
                             std::queue<OUString>& rPositivePercentages);
-    virtual ~GraphicImport();
+    virtual ~GraphicImport() override;
 
     // BinaryObj
     virtual void data(const sal_uInt8* buffer, size_t len, writerfilter::Reference<Properties>::Pointer_t ref) override;
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx
index 80891b124ec6..ec1b8dd6d176 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.hxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx
@@ -31,7 +31,7 @@ class LatentStyleHandler
 
 public:
     LatentStyleHandler();
-    virtual ~LatentStyleHandler();
+    virtual ~LatentStyleHandler() override;
 
     const std::vector<css::beans::PropertyValue>& getAttributes() const;
 };
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx
index 6a8ff9dfd944..92741825f5c0 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/writerfilter/source/dmapper/MeasureHandler.hxx
@@ -46,7 +46,7 @@ class MeasureHandler : public LoggedProperties
 
 public:
     MeasureHandler();
-    virtual ~MeasureHandler();
+    virtual ~MeasureHandler() override;
 
     sal_Int32 getMeasureValue() const;
 
diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx
index 124f221ec388..f2396dce2b14 100644
--- a/writerfilter/source/dmapper/ModelEventListener.hxx
+++ b/writerfilter/source/dmapper/ModelEventListener.hxx
@@ -32,7 +32,7 @@ class ModelEventListener : public cppu::WeakImplHelper<css::document::XEventList
     bool m_bControls;
 public:
     ModelEventListener(bool bIndexes, bool bControls);
-    virtual ~ModelEventListener();
+    virtual ~ModelEventListener() override;
 
     virtual void SAL_CALL notifyEvent(const css::document::EventObject& Event) throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index f189041e9030..039eabdb927e 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -73,7 +73,7 @@ public:
         ,m_outline(false)
         {}
 
-    virtual ~ListLevel( ){ }
+    virtual ~ListLevel( ) override { }
 
     // Setters for the import
     void SetValue( Id nId, sal_Int32 nValue );
@@ -178,7 +178,7 @@ public:
     typedef std::shared_ptr< ListDef > Pointer;
 
     ListDef( );
-    virtual ~ListDef( );
+    virtual ~ListDef( ) override;
 
     // Accessors
     void SetAbstractDefinition( AbstractListDef::Pointer pAbstract ) { m_pAbstractDef = pAbstract; };
@@ -228,7 +228,7 @@ private:
 public:
 
     ListsManager(DomainMapper& rDMapper, const css::uno::Reference<css::lang::XMultiServiceFactory>& xFactory);
-    virtual ~ListsManager();
+    virtual ~ListsManager() override;
 
     typedef std::shared_ptr< ListsManager >  Pointer;
 
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index 503c164e24f0..2f99de501e5f 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -78,7 +78,7 @@ class OLEHandler : public LoggedProperties
 
 public:
     OLEHandler(DomainMapper& rDomainMapper);
-    virtual ~OLEHandler();
+    virtual ~OLEHandler() override;
 
     const css::uno::Reference<css::drawing::XShape>& getShape() { return m_xShape; };
 
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index ef699ca8df42..8fa0f40a6976 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -60,7 +60,7 @@ private:
 
 public:
     PageBordersHandler( );
-    virtual ~PageBordersHandler( );
+    virtual ~PageBordersHandler( ) override;
 
     inline sal_Int32 GetDisplayOffset( )
     {
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 37e111d9e08e..3a90fa6a5ec4 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -266,7 +266,7 @@ class SectionPropertyMap : public PropertyMap
 
 public:
         explicit SectionPropertyMap(bool bIsFirstSection);
-        virtual ~SectionPropertyMap();
+        virtual ~SectionPropertyMap() override;
 
     enum PageType
     {
@@ -469,7 +469,7 @@ class StyleSheetPropertyMap : public PropertyMap, public ParagraphProperties
     sal_Int32               mnNumId;
 public:
     explicit StyleSheetPropertyMap();
-    virtual ~StyleSheetPropertyMap();
+    virtual ~StyleSheetPropertyMap() override;
 
     void SetCT_TrPrBase_jc(        sal_Int32 nSet )
         {mnCT_TrPrBase_jc = nSet;        mbCT_TrPrBase_jcSet = true;     }
@@ -500,7 +500,7 @@ class ParagraphPropertyMap : public PropertyMap, public ParagraphProperties
 {
 public:
     explicit ParagraphPropertyMap();
-    virtual ~ParagraphPropertyMap();
+    virtual ~ParagraphPropertyMap() override;
 
 };
 
@@ -535,7 +535,7 @@ private:
 
 public:
     explicit TablePropertyMap();
-    virtual ~TablePropertyMap();
+    virtual ~TablePropertyMap() override;
 
     bool    getValue( TablePropertyMapTarget eWhich, sal_Int32& nFill );
     void    setValue( TablePropertyMapTarget eWhich, sal_Int32 nSet );
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx
index ee7bc7f1d740..632129c10f04 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.hxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx
@@ -49,7 +49,7 @@ class SectionColumnHandler : public LoggedProperties
 
 public:
     SectionColumnHandler();
-    virtual ~SectionColumnHandler();
+    virtual ~SectionColumnHandler() override;
 
     bool        IsEqualWidth() const { return m_bEqualWidth; }
     sal_Int32   GetSpace() const { return m_nSpace; }
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index 648bf6d41b93..8328ec2050b5 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -46,7 +46,7 @@ class SettingsTable : public LoggedProperties, public LoggedTable
 
  public:
     SettingsTable();
-    virtual ~SettingsTable();
+    virtual ~SettingsTable() override;
 
     //returns default TabStop in 1/100th mm
     int GetDefaultTabStop() const;
diff --git a/writerfilter/source/dmapper/SmartTagHandler.hxx b/writerfilter/source/dmapper/SmartTagHandler.hxx
index e6a4a230fed5..a8365a64e2d4 100644
--- a/writerfilter/source/dmapper/SmartTagHandler.hxx
+++ b/writerfilter/source/dmapper/SmartTagHandler.hxx
@@ -35,7 +35,7 @@ class SmartTagHandler
 
 public:
     SmartTagHandler(const css::uno::Reference<css::uno::XComponentContext>& xComponentContext, const css::uno::Reference<css::text::XTextDocument>& xTextDocument);
-    virtual ~SmartTagHandler();
+    virtual ~SmartTagHandler() override;
 
     virtual void lcl_attribute(Id Name, Value& val) override;
     virtual void lcl_sprm(Sprm& sprm) override;
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index a2344dbba3df..5bacc96b050c 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -88,7 +88,7 @@ class StyleSheetTable :
 
 public:
     StyleSheetTable(DomainMapper& rDMapper, css::uno::Reference<css::text::XTextDocument> const& xTextDocument, bool bIsNewDoc);
-    virtual ~StyleSheetTable();
+    virtual ~StyleSheetTable() override;
 
     void ApplyStyleSheets( const FontTablePtr& rFontTable );
     const StyleSheetEntryPtr FindStyleSheetByISTD(const OUString& sIndex);
@@ -144,7 +144,7 @@ public:
     PropertyMapPtr GetProperties( sal_Int32 nMask);
 
     TableStyleSheetEntry( StyleSheetEntry& aEntry, StyleSheetTable* pStyles );
-    virtual ~TableStyleSheetEntry( );
+    virtual ~TableStyleSheetEntry( ) override;
 
 protected:
     PropertyMapPtr GetLocalPropertiesFromMask( sal_Int32 nMask );
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx
index 3e8ce7f802f4..677c44fa6660 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -69,7 +69,7 @@ private:
 
 public:
     TDefTableHandler();
-    virtual ~TDefTableHandler();
+    virtual ~TDefTableHandler() override;
 
     void fillCellProperties( size_t nCell, const ::std::shared_ptr< TablePropertyMap >& pCellProperties) const;
     void enableInteropGrabBag(const OUString& aName);
diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx
index 1a1daece76a3..1e0d096f02c6 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.hxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.hxx
@@ -81,7 +81,7 @@ public:
     }
 
     TablePositionHandler();
-    virtual ~TablePositionHandler();
+    virtual ~TablePositionHandler() override;
 
     /** Compute the UNO properties for the frame containing the table based
         on the received tokens.
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index 393242554fd9..5d38727f806c 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -66,7 +66,7 @@ private:
 
 public:
     explicit TblStylePrHandler( DomainMapper & rDMapper );
-    virtual ~TblStylePrHandler( );
+    virtual ~TblStylePrHandler( ) override;
 
     const PropertyMapPtr&       getProperties() { return m_pProperties; };
     inline TblStyleType         getType() { return m_nType; };
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index 1ee928d76475..fd89b2adf5d8 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -44,7 +44,7 @@ private:
 
 public:
     TextEffectsHandler(sal_uInt32 aElementId);
-    virtual ~TextEffectsHandler();
+    virtual ~TextEffectsHandler() override;
 
     const boost::optional<PropertyIds>& getGrabBagPropertyId() { return maPropertyId;}
 
diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx
index 38d304134035..5965e7c42e02 100644
--- a/writerfilter/source/dmapper/ThemeTable.hxx
+++ b/writerfilter/source/dmapper/ThemeTable.hxx
@@ -39,7 +39,7 @@ class ThemeTable : public LoggedProperties, public LoggedTable
 
 public:
     ThemeTable();
-    virtual ~ThemeTable();
+    virtual ~ThemeTable() override;
 
     const OUString getFontNameForTheme(const Id id) const;
     static OUString getStringForTheme(const Id id);
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx
index 81130b984fca..272e86de0c15 100644
--- a/writerfilter/source/dmapper/TrackChangesHandler.hxx
+++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx
@@ -33,7 +33,7 @@ class TrackChangesHandler : public LoggedProperties
 
 public:
     explicit TrackChangesHandler( sal_Int32 nToken );
-    virtual ~TrackChangesHandler();
+    virtual ~TrackChangesHandler() override;
 
     /// Compute the UNO properties for the track changes object based on the received tokens.
     css::uno::Sequence<css::beans::PropertyValue> getRedlineProperties() const;
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index c44cf0ced996..0f4002752622 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -58,7 +58,7 @@ class WrapPolygonHandler : public LoggedProperties
 {
 public:
     WrapPolygonHandler();
-    virtual ~WrapPolygonHandler();
+    virtual ~WrapPolygonHandler() override;
 
     const WrapPolygon::Pointer_t& getPolygon() { return mpPolygon;}
 
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index f16be42be8f8..12a49abd3208 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -94,7 +94,7 @@ protected:
     void resolveEmbeddingsStream(const OOXMLStream::Pointer_t& pStream);
 public:
     OOXMLDocumentImpl(OOXMLStream::Pointer_t const & pStream, const css::uno::Reference<css::task::XStatusIndicator>& xStatusIndicator, bool bSkipImages, const css::uno::Sequence<css::beans::PropertyValue>& rDescriptor);
-    virtual ~OOXMLDocumentImpl();
+    virtual ~OOXMLDocumentImpl() override;
 
     virtual void resolve(Stream & rStream) override;
 
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index a8ad379a7399..0550eecdf1ad 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -48,7 +48,7 @@ public:
 
     explicit OOXMLFastContextHandler(OOXMLFastContextHandler * pContext);
 
-    virtual ~OOXMLFastContextHandler();
+    virtual ~OOXMLFastContextHandler() override;
 
     // css::xml::sax::XFastContextHandler:
     virtual void SAL_CALL startFastElement (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs)
@@ -243,7 +243,7 @@ class OOXMLFastContextHandlerStream : public OOXMLFastContextHandler
 {
 public:
     explicit OOXMLFastContextHandlerStream(OOXMLFastContextHandler * pContext);
-    virtual ~OOXMLFastContextHandlerStream();
+    virtual ~OOXMLFastContextHandlerStream() override;
 
     virtual ResourceEnum_t getResource() const override { return STREAM; }
 
@@ -263,7 +263,7 @@ class OOXMLFastContextHandlerProperties : public OOXMLFastContextHandler
 {
 public:
     explicit OOXMLFastContextHandlerProperties(OOXMLFastContextHandler * pContext);
-    virtual ~OOXMLFastContextHandlerProperties();
+    virtual ~OOXMLFastContextHandlerProperties() override;
 
     virtual OOXMLValue::Pointer_t getValue() const override;
     virtual ResourceEnum_t getResource() const override { return PROPERTIES; }
@@ -300,7 +300,7 @@ class OOXMLFastContextHandlerPropertyTable :
 {
 public:
     explicit OOXMLFastContextHandlerPropertyTable(OOXMLFastContextHandler * pContext);
-    virtual ~OOXMLFastContextHandlerPropertyTable();
+    virtual ~OOXMLFastContextHandlerPropertyTable() override;
 
 protected:
     OOXMLTable mTable;
@@ -314,7 +314,7 @@ class OOXMLFastContextHandlerValue :
 {
 public:
     explicit OOXMLFastContextHandlerValue(OOXMLFastContextHandler * pContext);
-    virtual ~OOXMLFastContextHandlerValue();
+    virtual ~OOXMLFastContextHandlerValue() override;
 
     void setValue(const OOXMLValue::Pointer_t& pValue);
     virtual OOXMLValue::Pointer_t getValue() const override;
@@ -337,7 +337,7 @@ class OOXMLFastContextHandlerTable : public OOXMLFastContextHandler
 {
 public:
     explicit OOXMLFastContextHandlerTable(OOXMLFastContextHandler * pContext);
-    virtual ~OOXMLFastContextHandlerTable();
+    virtual ~OOXMLFastContextHandlerTable() override;
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext (Token_t Element,
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
@@ -362,7 +362,7 @@ class OOXMLFastContextHandlerXNote : public OOXMLFastContextHandlerProperties
 {
 public:
     explicit OOXMLFastContextHandlerXNote(OOXMLFastContextHandler * pContext);
-    virtual ~OOXMLFastContextHandlerXNote();
+    virtual ~OOXMLFastContextHandlerXNote() override;
 
     void checkId(const OOXMLValue::Pointer_t& pValue);
 
@@ -388,7 +388,7 @@ class OOXMLFastContextHandlerTextTableCell : public OOXMLFastContextHandler
 {
 public:
     explicit OOXMLFastContextHandlerTextTableCell(OOXMLFastContextHandler * pContext);
-    virtual ~OOXMLFastContextHandlerTextTableCell();
+    virtual ~OOXMLFastContextHandlerTextTableCell() override;
 
     virtual std::string getType() const override { return "TextTableCell"; }
 
@@ -400,7 +400,7 @@ class OOXMLFastContextHandlerTextTableRow : public OOXMLFastContextHandler
 {
 public:
     explicit OOXMLFastContextHandlerTextTableRow(OOXMLFastContextHandler * pContext);
-    virtual ~OOXMLFastContextHandlerTextTableRow();
+    virtual ~OOXMLFastContextHandlerTextTableRow() override;
 
     virtual std::string getType() const override { return "TextTableRow"; }
 
@@ -417,7 +417,7 @@ class OOXMLFastContextHandlerTextTable : public OOXMLFastContextHandler
 public:
     explicit OOXMLFastContextHandlerTextTable(OOXMLFastContextHandler * pContext);
 
-    virtual ~OOXMLFastContextHandlerTextTable();
+    virtual ~OOXMLFastContextHandlerTextTable() override;
 
     virtual std::string getType() const override { return "TextTable"; }
 
@@ -437,7 +437,7 @@ private:
 
 public:
     explicit OOXMLFastContextHandlerShape(OOXMLFastContextHandler * pContext);
-    virtual ~OOXMLFastContextHandlerShape();
+    virtual ~OOXMLFastContextHandlerShape() override;
 
     virtual std::string getType() const override { return "Shape"; }
 
@@ -486,7 +486,7 @@ class OOXMLFastContextHandlerWrapper : public OOXMLFastContextHandler
 {
 public:
     explicit OOXMLFastContextHandlerWrapper(OOXMLFastContextHandler * pParent, css::uno::Reference<css::xml::sax::XFastContextHandler> const & xContext);
-    virtual ~OOXMLFastContextHandlerWrapper();
+    virtual ~OOXMLFastContextHandlerWrapper() override;
 
     // css::xml::sax::XFastContextHandler:
     virtual void SAL_CALL startUnknownElement(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index 5cfdc3679724..a473c55b31d7 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -42,7 +42,7 @@ public:
         Stream* pStream,
         OOXMLDocumentImpl* pDocument,
         sal_Int32 nXNoteId );
-    virtual ~OOXMLFastDocumentHandler();
+    virtual ~OOXMLFastDocumentHandler() override;
 
     // css::xml::sax::XFastDocumentHandler:
     virtual void SAL_CALL startDocument()
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
index 8cc37729a096..8aa7c92a4ee3 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
@@ -33,7 +33,7 @@ class OOXMLValue : public Value
 public:
     typedef std::shared_ptr<OOXMLValue> Pointer_t;
     OOXMLValue();
-    virtual ~OOXMLValue();
+    virtual ~OOXMLValue() override;
 
     virtual int getInt() const override;
     ;
@@ -78,7 +78,7 @@ protected:
     mutable OOXMLBinaryObjectReference::Pointer_t mpBinaryObj;
 public:
     explicit OOXMLBinaryValue(OOXMLBinaryObjectReference::Pointer_t const & pBinaryObj);
-    virtual ~OOXMLBinaryValue();
+    virtual ~OOXMLBinaryValue() override;
 
     virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() override;
 #ifdef DEBUG_WRITERFILTER
@@ -96,7 +96,7 @@ public:
     static OOXMLValue::Pointer_t const & Create (bool bValue);
     static OOXMLValue::Pointer_t Create (const char *pValue);
 
-    virtual ~OOXMLBooleanValue();
+    virtual ~OOXMLBooleanValue() override;
 
     virtual int getInt() const override;
     virtual css::uno::Any getAny() const override;
@@ -112,7 +112,7 @@ protected:
     OUString mStr;
 public:
     explicit OOXMLStringValue(const OUString & rStr);
-    virtual ~OOXMLStringValue();
+    virtual ~OOXMLStringValue() override;
 
     virtual css::uno::Any getAny() const override;
     virtual OUString getString() const override;
@@ -129,7 +129,7 @@ protected:
 
 public:
     explicit OOXMLInputStreamValue(css::uno::Reference<css::io::XInputStream> const & xInputStream);
-    virtual ~OOXMLInputStreamValue();
+    virtual ~OOXMLInputStreamValue() override;
 
     virtual css::uno::Any getAny() const override;
 #ifdef DEBUG_WRITERFILTER
@@ -187,7 +187,7 @@ class OOXMLPropertySetValue : public OOXMLValue
     OOXMLPropertySet::Pointer_t mpPropertySet;
 public:
     explicit OOXMLPropertySetValue(const OOXMLPropertySet::Pointer_t& pPropertySet);
-    virtual ~OOXMLPropertySetValue();
+    virtual ~OOXMLPropertySetValue() override;
 
     virtual writerfilter::Reference<Properties>::Pointer_t getProperties() override;
 #ifdef DEBUG_WRITERFILTER
@@ -203,7 +203,7 @@ protected:
     explicit OOXMLIntegerValue(sal_Int32 nValue);
 public:
     static OOXMLValue::Pointer_t Create (sal_Int32 nValue);
-    virtual ~OOXMLIntegerValue();
+    virtual ~OOXMLIntegerValue() override;
 
     virtual int getInt() const override;
     virtual css::uno::Any getAny() const override;
@@ -220,7 +220,7 @@ protected:
 public:
     explicit OOXMLHexValue(sal_uInt32 nValue);
     explicit OOXMLHexValue(const char * pValue);
-    virtual ~OOXMLHexValue();
+    virtual ~OOXMLHexValue() override;
 
     virtual int getInt() const override;
 #ifdef DEBUG_WRITERFILTER
@@ -236,7 +236,7 @@ protected:
     sal_uInt32 mnValue;
 public:
     explicit OOXMLUniversalMeasureValue(const char * pValue);
-    virtual ~OOXMLUniversalMeasureValue();
+    virtual ~OOXMLUniversalMeasureValue() override;
 
     virtual int getInt() const override;
 #ifdef DEBUG_WRITERFILTER
@@ -251,7 +251,7 @@ protected:
     css::uno::Reference<css::drawing::XShape> mrShape;
 public:
     explicit OOXMLShapeValue(css::uno::Reference<css::drawing::XShape> const & rShape);
-    virtual ~OOXMLShapeValue();
+    virtual ~OOXMLShapeValue() override;
 
     virtual css::uno::Any getAny() const override;
 #ifdef DEBUG_WRITERFILTER
@@ -266,7 +266,7 @@ protected:
     css::uno::Reference< css::embed::XEmbeddedObject > component;
 public:
     explicit OOXMLStarMathValue( css::uno::Reference< css::embed::XEmbeddedObject > const & component );
-    virtual ~OOXMLStarMathValue();
+    virtual ~OOXMLStarMathValue() override;
 
     virtual css::uno::Any getAny() const override;
 #ifdef DEBUG_WRITERFILTER
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
index 6a1b1b48ab0c..aff8189b7396 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
@@ -68,7 +68,7 @@ public:
      StreamType_t nType, bool bRepairStorage);
     OOXMLStreamImpl(OOXMLStreamImpl & rStream, const OUString & rId);
 
-    virtual ~OOXMLStreamImpl();
+    virtual ~OOXMLStreamImpl() override;
 
     virtual css::uno::Reference<css::xml::sax::XFastParser> getFastParser() override;
     virtual css::uno::Reference<css::io::XInputStream> getDocumentStream() override;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 91ba7ee38d41..66588ba35436 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -385,7 +385,7 @@ public:
                     css::uno::Reference<css::frame::XFrame> const& xFrame,
                     css::uno::Reference<css::task::XStatusIndicator> const& xStatusIndicator,
                     const utl::MediaDescriptor& rMediaDescriptor);
-    virtual ~RTFDocumentImpl();
+    virtual ~RTFDocumentImpl() override;
 
     // RTFDocument
     virtual void resolve(Stream& rHandler) override;
diff --git a/writerfilter/source/rtftok/rtflookahead.hxx b/writerfilter/source/rtftok/rtflookahead.hxx
index d982d687aa0f..f96b2f7cf37f 100644
--- a/writerfilter/source/rtftok/rtflookahead.hxx
+++ b/writerfilter/source/rtftok/rtflookahead.hxx
@@ -28,7 +28,7 @@ class RTFLookahead : public RTFListener
 {
 public:
     RTFLookahead(SvStream& rStream, sal_Size nGroupStart);
-    virtual ~RTFLookahead();
+    virtual ~RTFLookahead() override;
     virtual RTFError dispatchDestination(RTFKeyword nKeyword) override;
     virtual RTFError dispatchFlag(RTFKeyword nKeyword) override;
     virtual RTFError dispatchSymbol(RTFKeyword nKeyword) override;
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx
index 64b43cd11670..eeb973094021 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -40,7 +40,7 @@ public:
     RTFValue(css::uno::Reference<css::io::XInputStream> const& xStream);
     RTFValue(css::uno::Reference<css::embed::XEmbeddedObject> const& xObject);
     RTFValue(const RTFShape& aShape);
-    virtual ~RTFValue();
+    virtual ~RTFValue() override;
     void setString(const OUString& sValue);
     virtual int getInt() const override;
     virtual OUString getString() const override;