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

67 files changed, 139 insertions, 139 deletions

diff --git a/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx b/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx
index 5d1fdc9581a8..266a88c2ad6a 100644
--- a/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx
+++ b/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx
@@ -24,7 +24,7 @@ public:
                             ::oox::core::XmlFilterBase& rFilter,
                             const OUString& rFragmentPath,
                             Theme& rTheme );
-    virtual             ~ThemeOverrideFragmentHandler();
+    virtual             ~ThemeOverrideFragmentHandler() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/chart/axiscontext.hxx b/oox/inc/drawingml/chart/axiscontext.hxx
index 81eb773ecf8e..4544bedf45e3 100644
--- a/oox/inc/drawingml/chart/axiscontext.hxx
+++ b/oox/inc/drawingml/chart/axiscontext.hxx
@@ -35,7 +35,7 @@ class AxisDispUnitsContext : public ContextBase< AxisDispUnitsModel >
 {
 public:
     explicit            AxisDispUnitsContext( ::oox::core::ContextHandler2Helper& rParent, AxisDispUnitsModel& rModel );
-    virtual             ~AxisDispUnitsContext();
+    virtual             ~AxisDispUnitsContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -50,7 +50,7 @@ class AxisContextBase : public ContextBase< AxisModel >
 {
 public:
     explicit            AxisContextBase( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel );
-    virtual             ~AxisContextBase();
+    virtual             ~AxisContextBase() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -62,7 +62,7 @@ class CatAxisContext : public AxisContextBase
 {
 public:
     explicit            CatAxisContext( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel );
-    virtual             ~CatAxisContext();
+    virtual             ~CatAxisContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -74,7 +74,7 @@ class DateAxisContext : public AxisContextBase
 {
 public:
     explicit            DateAxisContext( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel );
-    virtual             ~DateAxisContext();
+    virtual             ~DateAxisContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -86,7 +86,7 @@ class SerAxisContext : public AxisContextBase
 {
 public:
     explicit            SerAxisContext( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel );
-    virtual             ~SerAxisContext();
+    virtual             ~SerAxisContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -98,7 +98,7 @@ class ValAxisContext : public AxisContextBase
 {
 public:
     explicit            ValAxisContext( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel );
-    virtual             ~ValAxisContext();
+    virtual             ~ValAxisContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
diff --git a/oox/inc/drawingml/chart/axisconverter.hxx b/oox/inc/drawingml/chart/axisconverter.hxx
index 4bf46b77a91c..1d98c41f8e46 100644
--- a/oox/inc/drawingml/chart/axisconverter.hxx
+++ b/oox/inc/drawingml/chart/axisconverter.hxx
@@ -40,7 +40,7 @@ public:
     explicit            AxisDispUnitsConverter(
                             const ConverterRoot& rParent,
                             AxisDispUnitsModel& rModel );
-    virtual             ~AxisDispUnitsConverter();
+    virtual             ~AxisDispUnitsConverter() override;
 
     /** Creates a chart2 axis and inserts it into the passed coordinate system. */
     void                convertFromModel(
@@ -56,7 +56,7 @@ public:
     explicit            AxisConverter(
                             const ConverterRoot& rParent,
                             AxisModel& rModel );
-    virtual             ~AxisConverter();
+    virtual             ~AxisConverter() override;
 
     /** Creates a chart2 axis and inserts it into the passed coordinate system. */
     void convertFromModel(
diff --git a/oox/inc/drawingml/chart/chartcontextbase.hxx b/oox/inc/drawingml/chart/chartcontextbase.hxx
index 9156b8106e45..2639e0823024 100644
--- a/oox/inc/drawingml/chart/chartcontextbase.hxx
+++ b/oox/inc/drawingml/chart/chartcontextbase.hxx
@@ -34,7 +34,7 @@ class ContextBase : public ::oox::core::ContextHandler2
 public:
     explicit            ContextBase( ::oox::core::ContextHandler2Helper& rParent, ModelType& rModel ) :
                             ::oox::core::ContextHandler2( rParent ), mrModel( rModel ) {}
-    virtual             ~ContextBase() {}
+    virtual             ~ContextBase() override {}
 
 protected:
     ModelType&          mrModel;
@@ -46,7 +46,7 @@ class FragmentBase : public ::oox::core::FragmentHandler2
 public:
     explicit            FragmentBase( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, ModelType& rModel ) :
                             ::oox::core::FragmentHandler2( rFilter, rFragmentPath, false ), mrModel( rModel ) {}
-    virtual             ~FragmentBase() {}
+    virtual             ~FragmentBase() override {}
 
 protected:
     ModelType&          mrModel;
@@ -58,7 +58,7 @@ class ShapePrWrapperContext : public ContextBase< Shape >
 {
 public:
     explicit            ShapePrWrapperContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rModel );
-    virtual             ~ShapePrWrapperContext();
+    virtual             ~ShapePrWrapperContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -71,7 +71,7 @@ class LayoutContext : public ContextBase< LayoutModel >
 {
 public:
     explicit            LayoutContext( ::oox::core::ContextHandler2Helper& rParent, LayoutModel& rModel );
-    virtual             ~LayoutContext();
+    virtual             ~LayoutContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
diff --git a/oox/inc/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/drawingml/chart/chartdrawingfragment.hxx
index 4d3419e622f3..3d7ce5caf59e 100644
--- a/oox/inc/drawingml/chart/chartdrawingfragment.hxx
+++ b/oox/inc/drawingml/chart/chartdrawingfragment.hxx
@@ -85,7 +85,7 @@ public:
                             const css::awt::Size& rChartSize,
                             const css::awt::Point& rShapesOffset,
                             bool bOleSupport );
-    virtual             ~ChartDrawingFragment();
+    virtual             ~ChartDrawingFragment() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onCharacters( const OUString& rChars ) override;
diff --git a/oox/inc/drawingml/chart/chartspaceconverter.hxx b/oox/inc/drawingml/chart/chartspaceconverter.hxx
index 7e919c292941..cd034123f150 100644
--- a/oox/inc/drawingml/chart/chartspaceconverter.hxx
+++ b/oox/inc/drawingml/chart/chartspaceconverter.hxx
@@ -37,7 +37,7 @@ class ChartSpaceConverter : public ConverterBase< ChartSpaceModel >
 {
 public:
     explicit            ChartSpaceConverter( const ConverterRoot& rParent, ChartSpaceModel& rModel );
-    virtual             ~ChartSpaceConverter();
+    virtual             ~ChartSpaceConverter() override;
 
     /** Converts the contained OOXML chart model to a chart2 document. */
     void                convertFromModel(
diff --git a/oox/inc/drawingml/chart/chartspacefragment.hxx b/oox/inc/drawingml/chart/chartspacefragment.hxx
index 8a3c66068cf8..fb3586202e9e 100644
--- a/oox/inc/drawingml/chart/chartspacefragment.hxx
+++ b/oox/inc/drawingml/chart/chartspacefragment.hxx
@@ -38,7 +38,7 @@ public:
                             ::oox::core::XmlFilterBase& rFilter,
                             const OUString& rFragmentPath,
                             ChartSpaceModel& rModel );
-    virtual             ~ChartSpaceFragment();
+    virtual             ~ChartSpaceFragment() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
diff --git a/oox/inc/drawingml/chart/converterbase.hxx b/oox/inc/drawingml/chart/converterbase.hxx
index 77238914b517..42f763b86405 100644
--- a/oox/inc/drawingml/chart/converterbase.hxx
+++ b/oox/inc/drawingml/chart/converterbase.hxx
@@ -109,7 +109,7 @@ public:
 protected:
     explicit            ConverterBase( const ConverterRoot& rParent, ModelType& rModel ) :
                             ConverterRoot( rParent ), mrModel( rModel ) {}
-    virtual             ~ConverterBase() {}
+    virtual             ~ConverterBase() override {}
 
 protected:
     ModelType&          mrModel;
@@ -122,7 +122,7 @@ class LayoutConverter : public ConverterBase< LayoutModel >
 {
 public:
     explicit            LayoutConverter( const ConverterRoot& rParent, LayoutModel& rModel );
-    virtual             ~LayoutConverter();
+    virtual             ~LayoutConverter() override;
 
     /** Tries to calculate the absolute position and size from the contained
         OOXML layout model. Returns true, if returned rectangle is valid. */
diff --git a/oox/inc/drawingml/chart/datasourcecontext.hxx b/oox/inc/drawingml/chart/datasourcecontext.hxx
index 07c98263a793..5f4b7f7d6877 100644
--- a/oox/inc/drawingml/chart/datasourcecontext.hxx
+++ b/oox/inc/drawingml/chart/datasourcecontext.hxx
@@ -39,7 +39,7 @@ class DoubleSequenceContext : public DataSequenceContextBase
 {
 public:
     explicit            DoubleSequenceContext( ::oox::core::ContextHandler2Helper& rParent, DataSequenceModel& rModel );
-    virtual             ~DoubleSequenceContext();
+    virtual             ~DoubleSequenceContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onCharacters( const OUString& rChars ) override;
@@ -60,7 +60,7 @@ class StringSequenceContext : public DataSequenceContextBase
 {
 public:
     explicit            StringSequenceContext( ::oox::core::ContextHandler2Helper& rParent, DataSequenceModel& rModel );
-    virtual             ~StringSequenceContext();
+    virtual             ~StringSequenceContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onCharacters( const OUString& rChars ) override;
@@ -79,7 +79,7 @@ class DataSourceContext : public ContextBase< DataSourceModel >
 {
 public:
     explicit            DataSourceContext( ::oox::core::ContextHandler2Helper& rParent, DataSourceModel& rModel );
-    virtual             ~DataSourceContext();
+    virtual             ~DataSourceContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
diff --git a/oox/inc/drawingml/chart/datasourceconverter.hxx b/oox/inc/drawingml/chart/datasourceconverter.hxx
index 7ce02d838ffa..cdaae6574bff 100644
--- a/oox/inc/drawingml/chart/datasourceconverter.hxx
+++ b/oox/inc/drawingml/chart/datasourceconverter.hxx
@@ -37,7 +37,7 @@ class DataSequenceConverter : public ConverterBase< DataSequenceModel >
 {
 public:
     explicit            DataSequenceConverter( const ConverterRoot& rParent, DataSequenceModel& rModel );
-    virtual             ~DataSequenceConverter();
+    virtual             ~DataSequenceConverter() override;
 
     /** Creates a data sequence object from the contained formula link. */
     css::uno::Reference< css::chart2::data::XDataSequence >
@@ -51,7 +51,7 @@ class DataSourceConverter : public ConverterBase< DataSourceModel >
 {
 public:
     explicit            DataSourceConverter( const ConverterRoot& rParent, DataSourceModel& rModel );
-    virtual             ~DataSourceConverter();
+    virtual             ~DataSourceConverter() override;
 
     /** Creates a data sequence object from the contained series data. */
     css::uno::Reference< css::chart2::data::XDataSequence >
diff --git a/oox/inc/drawingml/chart/plotareacontext.hxx b/oox/inc/drawingml/chart/plotareacontext.hxx
index 161b0d244cf3..67efde118980 100644
--- a/oox/inc/drawingml/chart/plotareacontext.hxx
+++ b/oox/inc/drawingml/chart/plotareacontext.hxx
@@ -35,7 +35,7 @@ class View3DContext : public ContextBase< View3DModel >
 {
 public:
     explicit            View3DContext( ::oox::core::ContextHandler2Helper& rParent, View3DModel& rModel );
-    virtual             ~View3DContext();
+    virtual             ~View3DContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -50,7 +50,7 @@ class WallFloorContext : public ContextBase< WallFloorModel >
 {
 public:
     explicit            WallFloorContext( ::oox::core::ContextHandler2Helper& rParent, WallFloorModel& rModel );
-    virtual             ~WallFloorContext();
+    virtual             ~WallFloorContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -64,7 +64,7 @@ class DataTableContext : public ContextBase< DataTableModel >
 {
 public:
     explicit            DataTableContext( ::oox::core::ContextHandler2Helper& rParent, DataTableModel& rModel );
-    virtual             ~DataTableContext();
+    virtual             ~DataTableContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -78,7 +78,7 @@ class PlotAreaContext : public ContextBase< PlotAreaModel >
 {
 public:
     explicit            PlotAreaContext( ::oox::core::ContextHandler2Helper& rParent, PlotAreaModel& rModel );
-    virtual             ~PlotAreaContext();
+    virtual             ~PlotAreaContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
diff --git a/oox/inc/drawingml/chart/plotareaconverter.hxx b/oox/inc/drawingml/chart/plotareaconverter.hxx
index 143d08a1649a..07061c1cc474 100644
--- a/oox/inc/drawingml/chart/plotareaconverter.hxx
+++ b/oox/inc/drawingml/chart/plotareaconverter.hxx
@@ -38,7 +38,7 @@ class View3DConverter : public ConverterBase< View3DModel >
 {
 public:
     explicit            View3DConverter( const ConverterRoot& rParent, View3DModel& rModel );
-    virtual             ~View3DConverter();
+    virtual             ~View3DConverter() override;
 
     /** Converts the OOXML plot area model to a chart2 diagram. */
     void                convertFromModel(
@@ -53,7 +53,7 @@ class WallFloorConverter : public ConverterBase< WallFloorModel >
 {
 public:
     explicit            WallFloorConverter( const ConverterRoot& rParent, WallFloorModel& rModel );
-    virtual             ~WallFloorConverter();
+    virtual             ~WallFloorConverter() override;
 
     /** Converts the OOXML wall/floor model to a chart2 diagram. */
     void                convertFromModel(
@@ -68,7 +68,7 @@ class DataTableConverter : public ConverterBase< DataTableModel >
 {
 public:
     explicit            DataTableConverter( const ConverterRoot& rParent, DataTableModel& rModel );
-    virtual             ~DataTableConverter();
+    virtual             ~DataTableConverter() override;
 
     /** Converts the OOXML data table model to a chart2 diagram. */
     void                convertFromModel(
@@ -82,7 +82,7 @@ class PlotAreaConverter : public ConverterBase< PlotAreaModel >
 {
 public:
     explicit            PlotAreaConverter( const ConverterRoot& rParent, PlotAreaModel& rModel );
-    virtual             ~PlotAreaConverter();
+    virtual             ~PlotAreaConverter() override;
 
     /** Converts the OOXML plot area model to a chart2 diagram. */
     void                convertFromModel( View3DModel& rView3DModel );
diff --git a/oox/inc/drawingml/chart/seriescontext.hxx b/oox/inc/drawingml/chart/seriescontext.hxx
index c0e6f979e342..a0d38ea8e6be 100644
--- a/oox/inc/drawingml/chart/seriescontext.hxx
+++ b/oox/inc/drawingml/chart/seriescontext.hxx
@@ -35,7 +35,7 @@ class DataLabelContext : public ContextBase< DataLabelModel >
 {
 public:
     explicit            DataLabelContext( ::oox::core::ContextHandler2Helper& rParent, DataLabelModel& rModel );
-    virtual             ~DataLabelContext();
+    virtual             ~DataLabelContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onCharacters( const OUString& rChars ) override;
@@ -50,7 +50,7 @@ class DataLabelsContext : public ContextBase< DataLabelsModel >
 {
 public:
     explicit            DataLabelsContext( ::oox::core::ContextHandler2Helper& rParent, DataLabelsModel& rModel );
-    virtual             ~DataLabelsContext();
+    virtual             ~DataLabelsContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onCharacters( const OUString& rChars ) override;
@@ -65,7 +65,7 @@ class PictureOptionsContext : public ContextBase< PictureOptionsModel >
 {
 public:
     explicit            PictureOptionsContext( ::oox::core::ContextHandler2Helper& rParent, PictureOptionsModel& rModel );
-    virtual             ~PictureOptionsContext();
+    virtual             ~PictureOptionsContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -79,7 +79,7 @@ class ErrorBarContext : public ContextBase< ErrorBarModel >
 {
 public:
     explicit            ErrorBarContext( ::oox::core::ContextHandler2Helper& rParent, ErrorBarModel& rModel );
-    virtual             ~ErrorBarContext();
+    virtual             ~ErrorBarContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -93,7 +93,7 @@ class TrendlineLabelContext : public ContextBase< TrendlineLabelModel >
 {
 public:
     explicit            TrendlineLabelContext( ::oox::core::ContextHandler2Helper& rParent, TrendlineLabelModel& rModel );
-    virtual             ~TrendlineLabelContext();
+    virtual             ~TrendlineLabelContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -107,7 +107,7 @@ class TrendlineContext : public ContextBase< TrendlineModel >
 {
 public:
     explicit            TrendlineContext( ::oox::core::ContextHandler2Helper& rParent, TrendlineModel& rModel );
-    virtual             ~TrendlineContext();
+    virtual             ~TrendlineContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onCharacters( const OUString& rChars ) override;
@@ -122,7 +122,7 @@ class DataPointContext : public ContextBase< DataPointModel >
 {
 public:
     explicit            DataPointContext( ::oox::core::ContextHandler2Helper& rParent, DataPointModel& rModel );
-    virtual             ~DataPointContext();
+    virtual             ~DataPointContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -136,7 +136,7 @@ class SeriesContextBase : public ContextBase< SeriesModel >
 {
 public:
     explicit            SeriesContextBase( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel );
-    virtual             ~SeriesContextBase();
+    virtual             ~SeriesContextBase() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -148,7 +148,7 @@ class AreaSeriesContext : public SeriesContextBase
 {
 public:
     explicit            AreaSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel );
-    virtual             ~AreaSeriesContext();
+    virtual             ~AreaSeriesContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -160,7 +160,7 @@ class BarSeriesContext : public SeriesContextBase
 {
 public:
     explicit            BarSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel );
-    virtual             ~BarSeriesContext();
+    virtual             ~BarSeriesContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -172,7 +172,7 @@ class BubbleSeriesContext : public SeriesContextBase
 {
 public:
     explicit            BubbleSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel );
-    virtual             ~BubbleSeriesContext();
+    virtual             ~BubbleSeriesContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -185,7 +185,7 @@ class LineSeriesContext : public SeriesContextBase
 {
 public:
     explicit            LineSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel );
-    virtual             ~LineSeriesContext();
+    virtual             ~LineSeriesContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -198,7 +198,7 @@ class PieSeriesContext : public SeriesContextBase
 {
 public:
     explicit            PieSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel );
-    virtual             ~PieSeriesContext();
+    virtual             ~PieSeriesContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -210,7 +210,7 @@ class RadarSeriesContext : public SeriesContextBase
 {
 public:
     explicit            RadarSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel );
-    virtual             ~RadarSeriesContext();
+    virtual             ~RadarSeriesContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -222,7 +222,7 @@ class ScatterSeriesContext : public SeriesContextBase
 {
 public:
     explicit            ScatterSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel );
-    virtual             ~ScatterSeriesContext();
+    virtual             ~ScatterSeriesContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -234,7 +234,7 @@ class SurfaceSeriesContext : public SeriesContextBase
 {
 public:
     explicit            SurfaceSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel );
-    virtual             ~SurfaceSeriesContext();
+    virtual             ~SurfaceSeriesContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
diff --git a/oox/inc/drawingml/chart/seriesconverter.hxx b/oox/inc/drawingml/chart/seriesconverter.hxx
index a502137b712f..6ee20c59f147 100644
--- a/oox/inc/drawingml/chart/seriesconverter.hxx
+++ b/oox/inc/drawingml/chart/seriesconverter.hxx
@@ -42,7 +42,7 @@ class DataLabelConverter : public ConverterBase< DataLabelModel >
 {
 public:
     explicit            DataLabelConverter( const ConverterRoot& rParent, DataLabelModel& rModel );
-    virtual             ~DataLabelConverter();
+    virtual             ~DataLabelConverter() override;
 
     /** Converts OOXML data label settings for the passed data point. */
     void                convertFromModel(
@@ -55,7 +55,7 @@ class DataLabelsConverter : public ConverterBase< DataLabelsModel >
 {
 public:
     explicit            DataLabelsConverter( const ConverterRoot& rParent, DataLabelsModel& rModel );
-    virtual             ~DataLabelsConverter();
+    virtual             ~DataLabelsConverter() override;
 
     /** Converts OOXML data label settings for the passed data series. */
     void                convertFromModel(
@@ -68,7 +68,7 @@ class ErrorBarConverter : public ConverterBase< ErrorBarModel >
 {
 public:
     explicit            ErrorBarConverter( const ConverterRoot& rParent, ErrorBarModel& rModel );
-    virtual             ~ErrorBarConverter();
+    virtual             ~ErrorBarConverter() override;
 
     /** Converts an OOXML errorbar and inserts it into the passed data series. */
     void                convertFromModel(
@@ -84,7 +84,7 @@ class TrendlineLabelConverter : public ConverterBase< TrendlineLabelModel >
 {
 public:
     explicit            TrendlineLabelConverter( const ConverterRoot& rParent, TrendlineLabelModel& rModel );
-    virtual             ~TrendlineLabelConverter();
+    virtual             ~TrendlineLabelConverter() override;
 
     /** Converts the OOXML trendline label. */
     void                convertFromModel( PropertySet& rPropSet );
@@ -95,7 +95,7 @@ class TrendlineConverter : public ConverterBase< TrendlineModel >
 {
 public:
     explicit            TrendlineConverter( const ConverterRoot& rParent, TrendlineModel& rModel );
-    virtual             ~TrendlineConverter();
+    virtual             ~TrendlineConverter() override;
 
     /** Converts an OOXML trendline and inserts it into the passed data series. */
     void                convertFromModel(
@@ -107,7 +107,7 @@ class DataPointConverter : public ConverterBase< DataPointModel >
 {
 public:
     explicit            DataPointConverter( const ConverterRoot& rParent, DataPointModel& rModel );
-    virtual             ~DataPointConverter();
+    virtual             ~DataPointConverter() override;
 
     /** Converts settings for a data point in the passed series. */
     void                convertFromModel(
@@ -121,7 +121,7 @@ class SeriesConverter : public ConverterBase< SeriesModel >
 {
 public:
     explicit            SeriesConverter( const ConverterRoot& rParent, SeriesModel& rModel );
-    virtual             ~SeriesConverter();
+    virtual             ~SeriesConverter() override;
 
     /** Creates a labeled data sequence object from category data link. */
     css::uno::Reference< css::chart2::data::XLabeledDataSequence >
diff --git a/oox/inc/drawingml/chart/titlecontext.hxx b/oox/inc/drawingml/chart/titlecontext.hxx
index eeb8184513e9..2d52720ef7a4 100644
--- a/oox/inc/drawingml/chart/titlecontext.hxx
+++ b/oox/inc/drawingml/chart/titlecontext.hxx
@@ -35,7 +35,7 @@ class TextContext : public ContextBase< TextModel >
 {
 public:
     explicit            TextContext(  ::oox::core::ContextHandler2Helper& rParent, TextModel& rModel );
-    virtual             ~TextContext();
+    virtual             ~TextContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onCharacters( const OUString& rChars ) override;
@@ -50,7 +50,7 @@ class TitleContext : public ContextBase< TitleModel >
 {
 public:
     explicit            TitleContext( ::oox::core::ContextHandler2Helper& rParent, TitleModel& rModel );
-    virtual             ~TitleContext();
+    virtual             ~TitleContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -64,7 +64,7 @@ class LegendContext : public ContextBase< LegendModel >
 {
 public:
     explicit            LegendContext( ::oox::core::ContextHandler2Helper& rParent, LegendModel& rModel );
-    virtual             ~LegendContext();
+    virtual             ~LegendContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
diff --git a/oox/inc/drawingml/chart/titleconverter.hxx b/oox/inc/drawingml/chart/titleconverter.hxx
index ccbc7f308422..10f2f000d4aa 100644
--- a/oox/inc/drawingml/chart/titleconverter.hxx
+++ b/oox/inc/drawingml/chart/titleconverter.hxx
@@ -42,7 +42,7 @@ class TextConverter : public ConverterBase< TextModel >
 {
 public:
     explicit            TextConverter( const ConverterRoot& rParent, TextModel& rModel );
-    virtual             ~TextConverter();
+    virtual             ~TextConverter() override;
 
     /** Creates a data sequence object from the contained text data. */
     css::uno::Reference< css::chart2::data::XDataSequence >
@@ -69,7 +69,7 @@ class TitleConverter : public ConverterBase< TitleModel >
 {
 public:
     explicit            TitleConverter( const ConverterRoot& rParent, TitleModel& rModel );
-    virtual             ~TitleConverter();
+    virtual             ~TitleConverter() override;
 
     /** Creates a title text object and attaches it at the passed interface. */
     void                convertFromModel(
@@ -85,7 +85,7 @@ class LegendConverter : public ConverterBase< LegendModel >
 {
 public:
     explicit            LegendConverter( const ConverterRoot& rParent, LegendModel& rModel );
-    virtual             ~LegendConverter();
+    virtual             ~LegendConverter() override;
 
     /** Creates a legend object and attaches it at the passed diagram. */
     void                convertFromModel(
diff --git a/oox/inc/drawingml/chart/typegroupcontext.hxx b/oox/inc/drawingml/chart/typegroupcontext.hxx
index 54260362991b..4c0a999a443f 100644
--- a/oox/inc/drawingml/chart/typegroupcontext.hxx
+++ b/oox/inc/drawingml/chart/typegroupcontext.hxx
@@ -35,7 +35,7 @@ class UpDownBarsContext : public ContextBase< UpDownBarsModel >
 {
 public:
     explicit            UpDownBarsContext( ::oox::core::ContextHandler2Helper& rParent, UpDownBarsModel& rModel );
-    virtual             ~UpDownBarsContext();
+    virtual             ~UpDownBarsContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -51,7 +51,7 @@ class AreaTypeGroupContext : public TypeGroupContextBase
 {
 public:
     explicit            AreaTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel );
-    virtual             ~AreaTypeGroupContext();
+    virtual             ~AreaTypeGroupContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -63,7 +63,7 @@ class BarTypeGroupContext : public TypeGroupContextBase
 {
 public:
     explicit            BarTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel );
-    virtual             ~BarTypeGroupContext();
+    virtual             ~BarTypeGroupContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -75,7 +75,7 @@ class BubbleTypeGroupContext : public TypeGroupContextBase
 {
 public:
     explicit            BubbleTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel );
-    virtual             ~BubbleTypeGroupContext();
+    virtual             ~BubbleTypeGroupContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -88,7 +88,7 @@ class LineTypeGroupContext : public TypeGroupContextBase
 {
 public:
     explicit            LineTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel );
-    virtual             ~LineTypeGroupContext();
+    virtual             ~LineTypeGroupContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -101,7 +101,7 @@ class PieTypeGroupContext : public TypeGroupContextBase
 {
 public:
     explicit            PieTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel );
-    virtual             ~PieTypeGroupContext();
+    virtual             ~PieTypeGroupContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -113,7 +113,7 @@ class RadarTypeGroupContext : public TypeGroupContextBase
 {
 public:
     explicit            RadarTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel );
-    virtual             ~RadarTypeGroupContext();
+    virtual             ~RadarTypeGroupContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -125,7 +125,7 @@ class ScatterTypeGroupContext : public TypeGroupContextBase
 {
 public:
     explicit            ScatterTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel );
-    virtual             ~ScatterTypeGroupContext();
+    virtual             ~ScatterTypeGroupContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
@@ -138,7 +138,7 @@ class SurfaceTypeGroupContext : public TypeGroupContextBase
 {
 public:
     explicit            SurfaceTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel );
-    virtual             ~SurfaceTypeGroupContext();
+    virtual             ~SurfaceTypeGroupContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
 };
diff --git a/oox/inc/drawingml/chart/typegroupconverter.hxx b/oox/inc/drawingml/chart/typegroupconverter.hxx
index c4fb0543f7ec..22a134ce8951 100644
--- a/oox/inc/drawingml/chart/typegroupconverter.hxx
+++ b/oox/inc/drawingml/chart/typegroupconverter.hxx
@@ -98,7 +98,7 @@ class UpDownBarsConverter : public ConverterBase< UpDownBarsModel >
 {
 public:
     explicit            UpDownBarsConverter( const ConverterRoot& rParent, UpDownBarsModel& rModel );
-    virtual             ~UpDownBarsConverter();
+    virtual             ~UpDownBarsConverter() override;
 
     /** Converts the OOXML up/down bars. */
     void                convertFromModel(
@@ -112,7 +112,7 @@ class TypeGroupConverter : public ConverterBase< TypeGroupModel >
 {
 public:
     explicit            TypeGroupConverter( const ConverterRoot& rParent, TypeGroupModel& rModel );
-    virtual             ~TypeGroupConverter();
+    virtual             ~TypeGroupConverter() override;
 
     /** Returns the type info struct that describes this chart type group. */
     const TypeGroupInfo& getTypeInfo() const { return maTypeInfo; }
diff --git a/oox/inc/drawingml/clrschemecontext.hxx b/oox/inc/drawingml/clrschemecontext.hxx
index ad9173d16b90..b16f1c25a7f6 100644
--- a/oox/inc/drawingml/clrschemecontext.hxx
+++ b/oox/inc/drawingml/clrschemecontext.hxx
@@ -38,7 +38,7 @@ class clrSchemeColorContext : private Color, public ColorContext
 {
 public:
     clrSchemeColorContext( ::oox::core::ContextHandler2Helper& rParent, ClrScheme& rClrScheme, sal_Int32 nColorToken );
-    virtual ~clrSchemeColorContext();
+    virtual ~clrSchemeColorContext() override;
 
 private:
     ClrScheme&      mrClrScheme;
diff --git a/oox/inc/drawingml/fillpropertiesgroupcontext.hxx b/oox/inc/drawingml/fillpropertiesgroupcontext.hxx
index 59cf7d27fa7d..b93249c14fe8 100644
--- a/oox/inc/drawingml/fillpropertiesgroupcontext.hxx
+++ b/oox/inc/drawingml/fillpropertiesgroupcontext.hxx
@@ -83,7 +83,7 @@ public:
     explicit            ArtisticEffectContext(
                             ::oox::core::ContextHandler2Helper& rParent,
                             ArtisticEffectProperties& rEffect );
-    virtual             ~ArtisticEffectContext();
+    virtual             ~ArtisticEffectContext() override;
 
     virtual ::oox::core::ContextHandlerRef
                         onCreateContext(
@@ -103,7 +103,7 @@ public:
     explicit            BlipExtensionContext(
                             ::oox::core::ContextHandler2Helper& rParent,
                             BlipFillProperties& rBlipProps );
-    virtual             ~BlipExtensionContext();
+    virtual             ~BlipExtensionContext() override;
 
     virtual ::oox::core::ContextHandlerRef
                         onCreateContext(
@@ -124,7 +124,7 @@ public:
                             ::oox::core::ContextHandler2Helper& rParent,
                             const ::oox::AttributeList& rAttribs,
                             BlipFillProperties& rBlipProps );
-    virtual             ~DuotoneContext();
+    virtual             ~DuotoneContext() override;
 
     virtual ::oox::core::ContextHandlerRef
                         onCreateContext(
@@ -146,7 +146,7 @@ public:
                             ::oox::core::ContextHandler2Helper& rParent,
                             const ::oox::AttributeList& rAttribs,
                             BlipFillProperties& rBlipProps );
-    virtual             ~ColorChangeContext();
+    virtual             ~ColorChangeContext() override;
 
     virtual ::oox::core::ContextHandlerRef
                         onCreateContext(
@@ -233,7 +233,7 @@ public:
     explicit            SimpleFillPropertiesContext(
                             ::oox::core::ContextHandler2Helper& rParent,
                             Color& rColor );
-    virtual             ~SimpleFillPropertiesContext();
+    virtual             ~SimpleFillPropertiesContext() override;
 
 protected:
     Color&              mrColor;
diff --git a/oox/inc/drawingml/linepropertiescontext.hxx b/oox/inc/drawingml/linepropertiescontext.hxx
index c1d03cd9fc61..950a7edf7926 100644
--- a/oox/inc/drawingml/linepropertiescontext.hxx
+++ b/oox/inc/drawingml/linepropertiescontext.hxx
@@ -33,7 +33,7 @@ public:
     LinePropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
             const ::oox::AttributeList& rAttributes,
             LineProperties& rLineProperties ) throw();
-    virtual ~LinePropertiesContext();
+    virtual ~LinePropertiesContext() override;
 
     virtual ::oox::core::ContextHandlerRef
         onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
diff --git a/oox/inc/drawingml/shapestylecontext.hxx b/oox/inc/drawingml/shapestylecontext.hxx
index 74788abe40eb..693d9bcdbfdc 100644
--- a/oox/inc/drawingml/shapestylecontext.hxx
+++ b/oox/inc/drawingml/shapestylecontext.hxx
@@ -29,7 +29,7 @@ class ShapeStyleContext : public ::oox::core::ContextHandler2
 {
 public:
     ShapeStyleContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rShape );
-    virtual ~ShapeStyleContext();
+    virtual ~ShapeStyleContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx b/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx
index 2e4e7abaca4f..dda5376e0b64 100644
--- a/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx
@@ -29,7 +29,7 @@ class TableBackgroundStyleContext : public ::oox::core::ContextHandler2
 {
 public:
     TableBackgroundStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStyle& rTableStyle );
-    virtual ~TableBackgroundStyleContext();
+    virtual ~TableBackgroundStyleContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/table/tablecellcontext.hxx b/oox/inc/drawingml/table/tablecellcontext.hxx
index d1c341b4ea29..320c3ffd1805 100644
--- a/oox/inc/drawingml/table/tablecellcontext.hxx
+++ b/oox/inc/drawingml/table/tablecellcontext.hxx
@@ -30,7 +30,7 @@ class TableCellContext : public ::oox::core::ContextHandler2
 public:
     TableCellContext( ::oox::core::ContextHandler2Helper& rParent,
         const ::oox::AttributeList& rAttribs, TableCell& rTableCell );
-    virtual ~TableCellContext();
+    virtual ~TableCellContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/table/tablecontext.hxx b/oox/inc/drawingml/table/tablecontext.hxx
index ba3c07ca319b..00545a8e8d64 100644
--- a/oox/inc/drawingml/table/tablecontext.hxx
+++ b/oox/inc/drawingml/table/tablecontext.hxx
@@ -30,7 +30,7 @@ class TableContext : public ShapeContext
 {
 public:
     TableContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr pShapePtr );
-    virtual ~TableContext();
+    virtual ~TableContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/table/tablepartstylecontext.hxx b/oox/inc/drawingml/table/tablepartstylecontext.hxx
index fde8231880d4..2a734d4d4ae5 100644
--- a/oox/inc/drawingml/table/tablepartstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablepartstylecontext.hxx
@@ -29,7 +29,7 @@ class TablePartStyleContext : public ::oox::core::ContextHandler2
 {
 public:
     TablePartStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStylePart& rTableStylePart );
-    virtual ~TablePartStyleContext();
+    virtual ~TablePartStyleContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/table/tablerowcontext.hxx b/oox/inc/drawingml/table/tablerowcontext.hxx
index 8ee5b35d63a3..129ff78d8b0c 100644
--- a/oox/inc/drawingml/table/tablerowcontext.hxx
+++ b/oox/inc/drawingml/table/tablerowcontext.hxx
@@ -31,7 +31,7 @@ class TableRowContext : public ::oox::core::ContextHandler2
 public:
     TableRowContext( ::oox::core::ContextHandler2Helper& rParent,
                      const ::oox::AttributeList& rAttribs, TableRow& rTableRow );
-    virtual ~TableRowContext();
+    virtual ~TableRowContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/table/tablestylecellstylecontext.hxx b/oox/inc/drawingml/table/tablestylecellstylecontext.hxx
index 772e3bef2c7c..5bce17c37397 100644
--- a/oox/inc/drawingml/table/tablestylecellstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablestylecellstylecontext.hxx
@@ -29,7 +29,7 @@ class TableStyleCellStyleContext : public ::oox::core::ContextHandler2
 {
 public:
     TableStyleCellStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStylePart& rTableStylePart );
-    virtual ~TableStyleCellStyleContext();
+    virtual ~TableStyleCellStyleContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/table/tablestylecontext.hxx b/oox/inc/drawingml/table/tablestylecontext.hxx
index d983d5587687..72f747c04e5f 100644
--- a/oox/inc/drawingml/table/tablestylecontext.hxx
+++ b/oox/inc/drawingml/table/tablestylecontext.hxx
@@ -31,7 +31,7 @@ public:
     TableStyleContext( ::oox::core::ContextHandler2Helper& rParent,
             const ::oox::AttributeList& rAttribs,
             TableStyle& rTableStyle );
-    virtual ~TableStyleContext();
+    virtual ~TableStyleContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx b/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx
index 65d0a90d8747..204d25d62ddb 100644
--- a/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx
+++ b/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx
@@ -34,7 +34,7 @@ public:
                             ::oox::core::XmlFilterBase& rFilter,
                             const OUString& rFragmentPath,
                             TableStyleList& rTableStyleList );
-    virtual             ~TableStyleListFragmentHandler();
+    virtual             ~TableStyleListFragmentHandler() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/table/tablestyletextstylecontext.hxx b/oox/inc/drawingml/table/tablestyletextstylecontext.hxx
index 7db5f3a45d2c..9bef38329848 100644
--- a/oox/inc/drawingml/table/tablestyletextstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablestyletextstylecontext.hxx
@@ -31,7 +31,7 @@ public:
     TableStyleTextStyleContext( ::oox::core::ContextHandler2Helper& rParent,
             const ::oox::AttributeList& rAttribs,
             TableStylePart& rTableStylePart );
-    virtual ~TableStyleTextStyleContext();
+    virtual ~TableStyleTextStyleContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/textcharacterpropertiescontext.hxx b/oox/inc/drawingml/textcharacterpropertiescontext.hxx
index d223afd3b5e1..716b4f097a86 100644
--- a/oox/inc/drawingml/textcharacterpropertiescontext.hxx
+++ b/oox/inc/drawingml/textcharacterpropertiescontext.hxx
@@ -32,7 +32,7 @@ public:
     TextCharacterPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
             const ::oox::AttributeList& rAttribs,
             TextCharacterProperties& rTextCharacterProperties );
-    virtual ~TextCharacterPropertiesContext();
+    virtual ~TextCharacterPropertiesContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/texteffectscontext.hxx b/oox/inc/drawingml/texteffectscontext.hxx
index e2de24b12d57..75d96bae9888 100644
--- a/oox/inc/drawingml/texteffectscontext.hxx
+++ b/oox/inc/drawingml/texteffectscontext.hxx
@@ -26,7 +26,7 @@ public:
     TextEffectsContext(oox::core::ContextHandler2Helper& rParent,
                        sal_Int32 aElementToken,
                        std::vector<css::beans::PropertyValue>& rTextEffectsProperties);
-    virtual ~TextEffectsContext();
+    virtual ~TextEffectsContext() override;
 
     virtual void onStartElement(const oox::AttributeList& rAttribs) override;
     virtual void onEndElement() override;
diff --git a/oox/inc/drawingml/textliststylecontext.hxx b/oox/inc/drawingml/textliststylecontext.hxx
index ced68dfb100b..a48161410e81 100644
--- a/oox/inc/drawingml/textliststylecontext.hxx
+++ b/oox/inc/drawingml/textliststylecontext.hxx
@@ -29,7 +29,7 @@ class TextListStyleContext : public ::oox::core::ContextHandler2
 {
 public:
     TextListStyleContext( ::oox::core::ContextHandler2Helper& rParent, TextListStyle& rTextListStyle );
-    virtual ~TextListStyleContext();
+    virtual ~TextListStyleContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/textparagraphpropertiescontext.hxx b/oox/inc/drawingml/textparagraphpropertiescontext.hxx
index 8f827e8ebda9..ba3fe098db1b 100644
--- a/oox/inc/drawingml/textparagraphpropertiescontext.hxx
+++ b/oox/inc/drawingml/textparagraphpropertiescontext.hxx
@@ -36,7 +36,7 @@ public:
     TextParagraphPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
             const ::oox::AttributeList& rAttributes,
             TextParagraphProperties& rTextParagraphProperties );
-    virtual ~TextParagraphPropertiesContext();
+    virtual ~TextParagraphPropertiesContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx
index 4dd42614bf01..4bd4577a1503 100644
--- a/oox/source/docprop/docprophandler.hxx
+++ b/oox/source/docprop/docprophandler.hxx
@@ -55,7 +55,7 @@ class OOXMLDocPropHandler : public ::cppu::WeakImplHelper< css::xml::sax::XFastD
 public:
     explicit            OOXMLDocPropHandler( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::document::XDocumentProperties >& rDocProp );
 
-    virtual             ~OOXMLDocPropHandler();
+    virtual             ~OOXMLDocPropHandler() override;
 
     void InitNew();
     void AddCustomProperty( const css::uno::Any& aAny );
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx
index b7796db7445a..71477a92af8a 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -65,7 +65,7 @@ class AxesSetConverter : public ConverterBase< AxesSetModel >
 {
 public:
     explicit            AxesSetConverter( const ConverterRoot& rParent, AxesSetModel& rModel );
-    virtual             ~AxesSetConverter();
+    virtual             ~AxesSetConverter() override;
 
     /** Converts the axes set model to a chart2 diagram. Returns an automatic
         chart title from a single series title, if possible. */
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index a490533917f9..3ee61c28c87c 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -928,7 +928,7 @@ class Path2DContext : public ContextHandler2
 {
 public:
     Path2DContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< css::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D );
-    virtual ~Path2DContext();
+    virtual ~Path2DContext() override;
     virtual ::oox::core::ContextHandlerRef
         onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.hxx b/oox/source/drawingml/diagram/constraintlistcontext.hxx
index 93ceeaf08eaa..730cd2d88a30 100644
--- a/oox/source/drawingml/diagram/constraintlistcontext.hxx
+++ b/oox/source/drawingml/diagram/constraintlistcontext.hxx
@@ -30,7 +30,7 @@ class ConstraintListContext : public ::oox::core::ContextHandler2
 {
 public:
     ConstraintListContext( ContextHandler2Helper& rParent, const AttributeList& rAttributes, const LayoutAtomPtr &pNode );
-    virtual ~ConstraintListContext();
+    virtual ~ConstraintListContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) override;
 private:
diff --git a/oox/source/drawingml/diagram/datamodelcontext.hxx b/oox/source/drawingml/diagram/datamodelcontext.hxx
index c2fa95026a7d..2642be374e40 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.hxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.hxx
@@ -32,7 +32,7 @@ class DataModelContext : public ::oox::core::ContextHandler2
 {
 public:
     DataModelContext( ::oox::core::ContextHandler2Helper& rParent, const DiagramDataPtr & pDataModelPtr );
-    virtual ~DataModelContext();
+    virtual ~DataModelContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
index af2a0d98aa60..9f5161b2f769 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
@@ -29,7 +29,7 @@ class DiagramDefinitionContext : public ::oox::core::ContextHandler2
 {
 public:
     DiagramDefinitionContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, const DiagramLayoutPtr &pLayout );
-    virtual ~DiagramDefinitionContext();
+    virtual ~DiagramDefinitionContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index 7b54b4fe4b3d..5e851f6424c6 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -29,7 +29,7 @@ class DiagramDataFragmentHandler : public ::oox::core::FragmentHandler2
 {
 public:
     DiagramDataFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr& rDataPtr ) throw();
-    virtual ~DiagramDataFragmentHandler() throw();
+    virtual ~DiagramDataFragmentHandler() throw() override;
 
     virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
@@ -43,7 +43,7 @@ class DiagramLayoutFragmentHandler : public ::oox::core::FragmentHandler2
 {
 public:
     DiagramLayoutFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr& rDataPtr ) throw();
-    virtual ~DiagramLayoutFragmentHandler() throw();
+    virtual ~DiagramLayoutFragmentHandler() throw() override;
 
     virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 6153e9cb0957..8601424b4aee 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -105,7 +105,7 @@ public:
         mnRefType(-1), mnRefPointType(-1), mfFactor(1.0), mfValue(0.0), mnOperator(0)
     {}
 
-    virtual ~ConstraintAtom() { }
+    virtual ~ConstraintAtom() override { }
 
     virtual void accept( LayoutAtomVisitor& ) override;
 
@@ -151,7 +151,7 @@ class AlgAtom
 public:
     AlgAtom() : mnType(0), maMap() {}
 
-    virtual ~AlgAtom() { }
+    virtual ~AlgAtom() override { }
 
     typedef std::map<sal_Int32,sal_Int32> ParamMap;
 
@@ -177,7 +177,7 @@ class ForEachAtom
 public:
     explicit ForEachAtom(const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes);
 
-    virtual ~ForEachAtom() { }
+    virtual ~ForEachAtom() override { }
 
     IteratorAttr & iterator()
         { return maIter; }
@@ -194,7 +194,7 @@ class ConditionAtom
 {
 public:
     explicit ConditionAtom(const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes);
-    virtual ~ConditionAtom()
+    virtual ~ConditionAtom() override
         { }
     virtual void accept( LayoutAtomVisitor& ) override;
     void readElseBranch()
@@ -215,7 +215,7 @@ class ChooseAtom
     : public LayoutAtom
 {
 public:
-    virtual ~ChooseAtom()
+    virtual ~ChooseAtom() override
         { }
     virtual void accept( LayoutAtomVisitor& ) override;
 };
@@ -240,7 +240,7 @@ public:
     typedef std::array<css::uno::Any, 9> VarMap;
 
     LayoutNode() : mnChildOrder(0) {}
-    virtual ~LayoutNode() { }
+    virtual ~LayoutNode() override { }
     virtual void accept( LayoutAtomVisitor& ) override;
     VarMap & variables()
         { return mVariables; }
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index d381b68511b6..9bb90a8d069c 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -158,7 +158,7 @@ public:
         {
         }
 
-    virtual ~LayoutVariablePropertySetContext()
+    virtual ~LayoutVariablePropertySetContext() override
         {
         }
 
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.hxx b/oox/source/drawingml/diagram/layoutnodecontext.hxx
index 7559af0abbbb..a98c86713b21 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.hxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.hxx
@@ -30,7 +30,7 @@ class LayoutNodeContext : public ::oox::core::ContextHandler2
 {
 public:
     LayoutNodeContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, const LayoutAtomPtr &pNode );
-    virtual ~LayoutNodeContext();
+    virtual ~LayoutNodeContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/source/drawingml/effectpropertiescontext.hxx b/oox/source/drawingml/effectpropertiescontext.hxx
index 9e0ec3fa4582..4482db6fe0de 100644
--- a/oox/source/drawingml/effectpropertiescontext.hxx
+++ b/oox/source/drawingml/effectpropertiescontext.hxx
@@ -22,7 +22,7 @@ class EffectPropertiesContext : public ::oox::core::ContextHandler2
 public:
     EffectPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
             EffectProperties& rEffectProperties ) throw();
-    virtual ~EffectPropertiesContext();
+    virtual ~EffectPropertiesContext() override;
 
     virtual ::oox::core::ContextHandlerRef
         onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
diff --git a/oox/source/drawingml/hyperlinkcontext.hxx b/oox/source/drawingml/hyperlinkcontext.hxx
index f886a7cca959..8e1ae9aebef5 100644
--- a/oox/source/drawingml/hyperlinkcontext.hxx
+++ b/oox/source/drawingml/hyperlinkcontext.hxx
@@ -35,7 +35,7 @@ public:
                             ::oox::core::ContextHandler2Helper& rParent,
                             const ::oox::AttributeList& rAttribs,
                             PropertyMap& aProperties );
-    virtual             ~HyperLinkContext();
+    virtual             ~HyperLinkContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/source/drawingml/texttabstoplistcontext.hxx b/oox/source/drawingml/texttabstoplistcontext.hxx
index cbec67799bc1..72e5474bfee9 100644
--- a/oox/source/drawingml/texttabstoplistcontext.hxx
+++ b/oox/source/drawingml/texttabstoplistcontext.hxx
@@ -33,7 +33,7 @@ namespace oox { namespace drawingml {
     public:
         TextTabStopListContext( ::oox::core::ContextHandler2Helper& rParent,
                 ::std::list< css::style::TabStop >  & aTabList );
-        virtual ~TextTabStopListContext();
+        virtual ~TextTabStopListContext() override;
 
         virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/source/export/ColorPropertySet.hxx b/oox/source/export/ColorPropertySet.hxx
index 11d73a8589c0..88fc20d3c286 100644
--- a/oox/source/export/ColorPropertySet.hxx
+++ b/oox/source/export/ColorPropertySet.hxx
@@ -39,7 +39,7 @@ class ColorPropertySet : public ::cppu::WeakImplHelper<
 public:
     // if bFillColor == false, the color is a LineColor
     explicit ColorPropertySet( sal_Int32 nColor, bool bFillColor = true );
-    virtual ~ColorPropertySet();
+    virtual ~ColorPropertySet() override;
 
 protected:
     // ____ XPropertySet ____
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index 68935f944e6e..19c665f11dc8 100644
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -58,7 +58,7 @@ public:
                             const Reference< XComponentContext >& rxContext,
                             const Reference< XNameContainer >& rxStorage,
                             const OUString& rElementName );
-    virtual             ~OleOutputStream();
+    virtual             ~OleOutputStream() override;
 
     virtual void SAL_CALL seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception ) override;
     virtual sal_Int64 SAL_CALL getPosition() throw( IOException, RuntimeException, std::exception ) override;
diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx
index 278e4255b2b2..4ab209180230 100644
--- a/oox/source/ppt/animvariantcontext.hxx
+++ b/oox/source/ppt/animvariantcontext.hxx
@@ -33,7 +33,7 @@ namespace oox { namespace ppt {
     {
     public:
         AnimVariantContext( ::oox::core::FragmentHandler2& rParent, ::sal_Int32 aElement, css::uno::Any & aValue );
-        virtual ~AnimVariantContext( ) throw( );
+        virtual ~AnimVariantContext( ) throw( ) override;
         virtual void onEndElement() override;
         virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
 
diff --git a/oox/source/ppt/buildlistcontext.hxx b/oox/source/ppt/buildlistcontext.hxx
index 84ec8e97c879..5fbf5f2b6618 100644
--- a/oox/source/ppt/buildlistcontext.hxx
+++ b/oox/source/ppt/buildlistcontext.hxx
@@ -31,7 +31,7 @@ namespace oox { namespace ppt {
     public:
         explicit BuildListContext( ::oox::core::FragmentHandler2& rParent );
 
-        virtual ~BuildListContext( );
+        virtual ~BuildListContext( ) override;
 
         virtual void onEndElement() override;
 
diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx
index dbe070118d59..4d396050a517 100644
--- a/oox/source/ppt/commonbehaviorcontext.hxx
+++ b/oox/source/ppt/commonbehaviorcontext.hxx
@@ -43,7 +43,7 @@ namespace oox { namespace ppt {
              const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
              const TimeNodePtr & pNode );
         virtual ~CommonBehaviorContext( )
-            throw( );
+            throw( ) override;
 
         virtual void onEndElement() override;
 
diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx
index f5109efe2ce4..1dd2687a674b 100644
--- a/oox/source/ppt/commontimenodecontext.hxx
+++ b/oox/source/ppt/commontimenodecontext.hxx
@@ -33,7 +33,7 @@ namespace oox { namespace ppt {
     {
     public:
         CommonTimeNodeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32  aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode);
-        virtual ~CommonTimeNodeContext( ) throw( );
+        virtual ~CommonTimeNodeContext( ) throw( ) override;
 
         virtual void onEndElement() override;
 
diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx
index 6ec307f1fb29..726191dba526 100644
--- a/oox/source/ppt/conditioncontext.hxx
+++ b/oox/source/ppt/conditioncontext.hxx
@@ -37,7 +37,7 @@ namespace oox { namespace ppt {
         CondContext( ::oox::core::FragmentHandler2& rParent,
                      const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
                      const TimeNodePtr & pNode, AnimationCondition & aCond );
-        virtual ~CondContext( ) throw( );
+        virtual ~CondContext( ) throw( ) override;
         virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
 
     private:
@@ -54,7 +54,7 @@ namespace oox { namespace ppt {
              sal_Int32  aElement,
              const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
              const TimeNodePtr & pNode, AnimationConditionList & aCondList );
-        virtual ~CondListContext( ) throw( );
+        virtual ~CondListContext( ) throw( ) override;
 
        virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
 
diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx
index e5957c410671..e8839abb5b61 100644
--- a/oox/source/ppt/customshowlistcontext.cxx
+++ b/oox/source/ppt/customshowlistcontext.cxx
@@ -37,7 +37,7 @@ public:
     CustomShowContext( ::oox::core::FragmentHandler2& rParent,
         const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
             CustomShow& rCustomShow );
-    virtual ~CustomShowContext( );
+    virtual ~CustomShowContext( ) override;
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
 };
 
diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx
index f8084971369f..f799a1bad158 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.hxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.hxx
@@ -26,7 +26,7 @@ public:
         const oox::ppt::ShapeLocation eShapeLocation,
         oox::drawingml::ShapePtr const & pGroupShapePtr,
         oox::drawingml::ShapePtr const & pShapePtr ) throw();
-    virtual ~ExtDrawingFragmentHandler() throw();
+    virtual ~ExtDrawingFragmentHandler() throw() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) override;
 
diff --git a/oox/source/ppt/headerfootercontext.hxx b/oox/source/ppt/headerfootercontext.hxx
index 7be60f09fe89..89ab5b9d79a7 100644
--- a/oox/source/ppt/headerfootercontext.hxx
+++ b/oox/source/ppt/headerfootercontext.hxx
@@ -32,7 +32,7 @@ namespace oox { namespace ppt {
         HeaderFooterContext( ::oox::core::FragmentHandler2& rParent,
             const AttributeList& rAttribs, HeaderFooter& rHeaderFooter );
 
-        virtual ~HeaderFooterContext( );
+        virtual ~HeaderFooterContext( ) override;
     };
 
 } }
diff --git a/oox/source/ppt/timeanimvaluecontext.hxx b/oox/source/ppt/timeanimvaluecontext.hxx
index add8fe040f84..2562393e71d7 100644
--- a/oox/source/ppt/timeanimvaluecontext.hxx
+++ b/oox/source/ppt/timeanimvaluecontext.hxx
@@ -34,7 +34,7 @@ namespace oox { namespace ppt {
             const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
             TimeAnimationValueList & aTavList );
 
-        virtual ~TimeAnimValueListContext( );
+        virtual ~TimeAnimValueListContext( ) override;
 
         virtual void onEndElement() override;
 
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 5efc6c7ed8ec..e795b6e8b129 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -179,7 +179,7 @@ namespace oox { namespace ppt {
 
             }
 
-        virtual ~SetTimeNodeContext() throw ()
+        virtual ~SetTimeNodeContext() throw () override
             {
                 if( maTo.hasValue() )
                 {
@@ -240,7 +240,7 @@ namespace oox { namespace ppt {
                 }
             }
 
-        virtual ~CmdTimeNodeContext() throw ()
+        virtual ~CmdTimeNodeContext() throw () override
             {
             }
 
@@ -353,7 +353,7 @@ namespace oox { namespace ppt {
                 mnPrevAc = xAttribs->getOptionalValueToken( XML_prevAc, 0 );
             }
 
-        virtual ~SequenceTimeNodeContext() throw()
+        virtual ~SequenceTimeNodeContext() throw() override
             {
             }
 
@@ -426,7 +426,7 @@ namespace oox { namespace ppt {
             , m_byColor( AnimationColorSpace::RGB, 0, 0, 0)
             {
             }
-        virtual ~AnimColorContext() throw()
+        virtual ~AnimColorContext() throw() override
             {
             }
 
@@ -555,7 +555,7 @@ namespace oox { namespace ppt {
                 mnValueType = xAttribs->getOptionalValueToken( XML_valueType, 0 );
             }
 
-        virtual ~AnimContext() throw ()
+        virtual ~AnimContext() throw () override
             {
                 ::std::list< TimeAnimationValue >::iterator iter, end;
                 int nKeyTimes = maTavList.size();
@@ -627,7 +627,7 @@ namespace oox { namespace ppt {
                     = makeAny((sal_Int16)AnimationTransformType::SCALE);
             }
 
-        virtual ~AnimScaleContext( ) throw( )
+        virtual ~AnimScaleContext( ) throw( ) override
             {
             }
 
@@ -726,7 +726,7 @@ namespace oox { namespace ppt {
                 }
             }
 
-        virtual ~AnimRotContext( ) throw( )
+        virtual ~AnimRotContext( ) throw( ) override
             {
             }
 
@@ -783,7 +783,7 @@ namespace oox { namespace ppt {
                 // TODO make sure the units are right. Likely not.
             }
 
-        virtual ~AnimMotionContext( ) throw()
+        virtual ~AnimMotionContext( ) throw() override
             {
             }
 
@@ -866,7 +866,7 @@ namespace oox { namespace ppt {
                 }
             }
 
-        virtual ~AnimEffectContext( ) throw()
+        virtual ~AnimEffectContext( ) throw() override
             {
             }
 
diff --git a/oox/source/ppt/timetargetelementcontext.hxx b/oox/source/ppt/timetargetelementcontext.hxx
index f5e4a65e5517..c51a6d8207a8 100644
--- a/oox/source/ppt/timetargetelementcontext.hxx
+++ b/oox/source/ppt/timetargetelementcontext.hxx
@@ -31,7 +31,7 @@ namespace oox { namespace ppt {
     {
     public:
         TimeTargetElementContext( ::oox::core::FragmentHandler2& rParent, const AnimTargetElementPtr & aValue );
-        virtual ~TimeTargetElementContext( ) throw( );
+        virtual ~TimeTargetElementContext( ) throw( ) override;
         virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
 
     private:
diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx
index 21dc10f3f804..ca7ac4ade8d1 100644
--- a/oox/source/shape/LockedCanvasContext.hxx
+++ b/oox/source/shape/LockedCanvasContext.hxx
@@ -23,7 +23,7 @@ class LockedCanvasContext : public oox::core::ContextHandler2
 {
 public:
     explicit LockedCanvasContext(oox::core::ContextHandler2Helper& rParent);
-    virtual ~LockedCanvasContext();
+    virtual ~LockedCanvasContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const ::oox::AttributeList& rAttribs) override;
 
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index 103a8106bd08..c594288d4d80 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -54,7 +54,7 @@ public:
     explicit ShapeContextHandler
     (css::uno::Reference< css::uno::XComponentContext > const & context);
 
-    virtual ~ShapeContextHandler();
+    virtual ~ShapeContextHandler() override;
 
     // css::lang::XServiceInfo:
     virtual OUString SAL_CALL getImplementationName()
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
index a14dcac6f40a..b4e202b15694 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
@@ -20,7 +20,7 @@ class ShapeDrawingFragmentHandler : public oox::core::FragmentHandler2
 {
 public:
     ShapeDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr const & pGroupShapePtr ) throw();
-    virtual ~ShapeDrawingFragmentHandler() throw();
+    virtual ~ShapeDrawingFragmentHandler() throw() override;
     virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
     virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const AttributeList& rAttribs ) override;
 
diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx
index a99c90c239ba..94d760992661 100644
--- a/oox/source/shape/ShapeFilterBase.hxx
+++ b/oox/source/shape/ShapeFilterBase.hxx
@@ -39,7 +39,7 @@ public:
                             const css::uno::Reference< css::uno::XComponentContext >& rxContext )
                             throw( css::uno::RuntimeException );
 
-    virtual             ~ShapeFilterBase();
+    virtual             ~ShapeFilterBase() override;
 
     /** Has to be implemented by each filter, returns the current theme. */
     virtual const ::oox::drawingml::Theme* getCurrentTheme() const override;
diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx
index a212bef255cd..6144ce427755 100644
--- a/oox/source/shape/WpgContext.hxx
+++ b/oox/source/shape/WpgContext.hxx
@@ -23,7 +23,7 @@ class WpgContext : public oox::core::ContextHandler2
 {
 public:
     explicit WpgContext(oox::core::ContextHandler2Helper& rParent);
-    virtual ~WpgContext();
+    virtual ~WpgContext() override;
 
     virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override;
 
diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx
index 799b2117e972..03091c738132 100644
--- a/oox/source/shape/WpsContext.hxx
+++ b/oox/source/shape/WpsContext.hxx
@@ -23,7 +23,7 @@ class WpsContext : public oox::core::ContextHandler2
 {
 public:
     WpsContext(oox::core::ContextHandler2Helper& rParent, css::uno::Reference<css::drawing::XShape> const& xShape);
-    virtual ~WpsContext();
+    virtual ~WpsContext() override;
 
     virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override;