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

61 files changed, 152 insertions, 152 deletions

diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx
index 950e82d9c0c1..2445cf2bbec7 100644
--- a/include/vcl/alpha.hxx
+++ b/include/vcl/alpha.hxx
@@ -35,7 +35,7 @@ public:
                 AlphaMask( const Bitmap& rBitmap );
                 AlphaMask( const AlphaMask& rAlphaMask );
                 AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency = nullptr );
-    virtual     ~AlphaMask();
+    virtual     ~AlphaMask() override;
 
     AlphaMask&  operator=( const Bitmap& rBitmap );
     AlphaMask&  operator=( const AlphaMask& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( rAlphaMask ) ); }
diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx
index f8f1cc8dfa7d..2788333fbcd0 100644
--- a/include/vcl/bitmapaccess.hxx
+++ b/include/vcl/bitmapaccess.hxx
@@ -84,7 +84,7 @@ class VCL_DLLPUBLIC BitmapReadAccess : public BitmapInfoAccess
 
 public:
     BitmapReadAccess(Bitmap& rBitmap);
-    virtual ~BitmapReadAccess();
+    virtual ~BitmapReadAccess() override;
 
     inline Scanline GetBuffer() const;
     inline Scanline GetScanline( long nY ) const;
@@ -167,7 +167,7 @@ class VCL_DLLPUBLIC BitmapWriteAccess : public BitmapReadAccess
 {
 public:
     BitmapWriteAccess(Bitmap& rBitmap);
-    virtual ~BitmapWriteAccess();
+    virtual ~BitmapWriteAccess() override;
 
     void CopyScanline(long nY, const BitmapReadAccess& rReadAcc);
     void CopyScanline(long nY,
diff --git a/include/vcl/bitmapscalesuper.hxx b/include/vcl/bitmapscalesuper.hxx
index 0f279617a6e1..ad817b5f9590 100644
--- a/include/vcl/bitmapscalesuper.hxx
+++ b/include/vcl/bitmapscalesuper.hxx
@@ -26,7 +26,7 @@ class VCL_DLLPUBLIC BitmapScaleSuper : public BitmapFilter
 {
 public:
                     BitmapScaleSuper(const double& rScaleX, const double& rScaleY);
-    virtual         ~BitmapScaleSuper();
+    virtual         ~BitmapScaleSuper() override;
 
     virtual bool    filter(Bitmap& rBitmap) override;
 
diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index 1cb5a5071715..fbb36e9eed31 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -51,7 +51,7 @@ class VCL_DLLPUBLIC ButtonDialog : public Dialog
 {
 public:
                         ButtonDialog( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG );
-    virtual             ~ButtonDialog();
+    virtual             ~ButtonDialog() override;
     virtual void        dispose() override;
 
     virtual void        Resize() override;
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index ac589ad35bad..1d425de57c92 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -66,7 +66,7 @@ protected:
     explicit            Button( WindowType nType );
 
 public:
-    virtual            ~Button();
+    virtual            ~Button() override;
     virtual void        dispose() override;
 
     virtual void        Click();
@@ -325,7 +325,7 @@ protected:
 public:
     explicit        RadioButton( vcl::Window* pParent, WinBits nWinStyle = 0 );
     explicit        RadioButton( vcl::Window* pParent, const ResId& );
-    virtual         ~RadioButton();
+    virtual         ~RadioButton() override;
     virtual void    dispose() override;
 
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) override;
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 684c273f73bd..81d1b90c3379 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -55,7 +55,7 @@ protected:
 public:
     explicit        ComboBox( vcl::Window* pParent, WinBits nStyle = 0 );
     explicit        ComboBox( vcl::Window* pParent, const ResId& );
-    virtual         ~ComboBox();
+    virtual         ~ComboBox() override;
     virtual void    dispose() override;
 
     virtual void    Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override;
diff --git a/include/vcl/configsettings.hxx b/include/vcl/configsettings.hxx
index 265d287787f5..b58692e6acde 100644
--- a/include/vcl/configsettings.hxx
+++ b/include/vcl/configsettings.hxx
@@ -47,7 +47,7 @@ namespace vcl
         virtual void ImplCommit() override;
 
     public:
-        virtual ~SettingsConfigItem();
+        virtual ~SettingsConfigItem() override;
 
         static SettingsConfigItem* get();
 
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index ae3266f0b386..6bfe7a8274c0 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -121,7 +121,7 @@ public:
 public:
     explicit        Control( vcl::Window* pParent, WinBits nWinStyle = 0 );
     explicit        Control( vcl::Window* pParent, const ResId& );
-    virtual         ~Control();
+    virtual         ~Control() override;
     virtual void    dispose() override;
 
     virtual void    EnableRTL ( bool bEnable = true ) override;
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index bd965b1adb81..3246574bd418 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -80,7 +80,7 @@ protected:
 public:
     explicit        Dialog( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG, InitFlag eFlag = InitFlag::Default );
     explicit        Dialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
-    virtual         ~Dialog();
+    virtual         ~Dialog() override;
     virtual void    dispose() override;
 
     virtual bool    Notify( NotifyEvent& rNEvt ) override;
diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx
index 2043102de169..babb5ad7e8ef 100644
--- a/include/vcl/dndhelp.hxx
+++ b/include/vcl/dndhelp.hxx
@@ -91,7 +91,7 @@ private:
 
 public:
                     DragAndDropWrapper( DragAndDropClient* pClient );
-                    virtual ~DragAndDropWrapper();
+                    virtual ~DragAndDropWrapper() override;
 
     // css::uno::XInterface
     css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx
index 1d6c446cb23b..b2935bf6a7e3 100644
--- a/include/vcl/dockingarea.hxx
+++ b/include/vcl/dockingarea.hxx
@@ -36,7 +36,7 @@ private:
 
 public:
     explicit        DockingAreaWindow( vcl::Window* pParent );
-    virtual         ~DockingAreaWindow();
+    virtual         ~DockingAreaWindow() override;
     virtual void    dispose() override;
 
     void            SetAlign( WindowAlign eNewAlign );
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index ba56bffe1da8..9647fc7494e2 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -277,7 +277,7 @@ public:
     DockingWindow(vcl::Window* pParent, WinBits nStyle = WB_STDDOCKWIN);
     DockingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
         const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>());
-    virtual ~DockingWindow();
+    virtual ~DockingWindow() override;
     virtual void dispose() override;
 
     virtual void    StartDocking();
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index be0515a10cab..05f56bc3afef 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -168,7 +168,7 @@ public:
 
     Edit( vcl::Window* pParent, WinBits nStyle = WB_BORDER );
     Edit( vcl::Window* pParent, const ResId& rResId );
-    virtual ~Edit();
+    virtual ~Edit() override;
     virtual void dispose() override;
 
     virtual void        MouseButtonDown( const MouseEvent& rMEvt ) override;
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 96f03d88d0c7..90267eb269e2 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -107,7 +107,7 @@ protected:
     SAL_DLLPRIVATE bool&    ImplGetInPattKeyInput() { return mbInPattKeyInput; }
 
 public:
-    virtual                 ~PatternFormatter();
+    virtual                 ~PatternFormatter() override;
 
     virtual void            Reformat() override;
 
@@ -156,7 +156,7 @@ protected:
     SAL_DLLPRIVATE void     ImplSetUserValue( sal_Int64 nNewValue, Selection* pNewSelection = nullptr );
 
 public:
-    virtual                 ~NumericFormatter();
+    virtual                 ~NumericFormatter() override;
 
     virtual void            Reformat() override;
 
@@ -214,7 +214,7 @@ protected:
     SAL_DLLPRIVATE bool     ImplMetricReformat( const OUString& rStr, double& rValue, OUString& rOutStr );
 
 public:
-    virtual                 ~MetricFormatter();
+    virtual                 ~MetricFormatter() override;
 
     virtual void            CustomConvert() = 0;
     virtual void            Reformat() override;
@@ -259,7 +259,7 @@ protected:
     SAL_DLLPRIVATE bool     ImplCurrencyReformat( const OUString& rStr, OUString& rOutStr );
 
 public:
-    virtual                 ~CurrencyFormatter();
+    virtual                 ~CurrencyFormatter() override;
 
     virtual void            Reformat() override;
 
@@ -303,7 +303,7 @@ protected:
     SAL_DLLPRIVATE bool     ImplAllowMalformedInput() const;
 
 public:
-    virtual                 ~DateFormatter();
+    virtual                 ~DateFormatter() override;
 
     virtual void            Reformat() override;
     virtual void            ReformatAll() override;
@@ -391,7 +391,7 @@ protected:
 
 public:
 
-    virtual                 ~TimeFormatter();
+    virtual                 ~TimeFormatter() override;
 
     virtual void            Reformat() override;
     virtual void            ReformatAll() override;
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index cabe13dcad7a..97e1e5ab66ca 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -57,7 +57,7 @@ protected:
 public:
     explicit        FixedText( vcl::Window* pParent, WinBits nStyle = 0 );
     explicit        FixedText( vcl::Window* pParent, const ResId& rResId );
-    virtual         ~FixedText();
+    virtual         ~FixedText() override;
     virtual void    dispose() override;
 
     virtual void    ApplySettings(vcl::RenderContext& rRenderContext) override;
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 63b2a78a4468..8933bf97d6e4 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -135,7 +135,7 @@ public:
     explicit        FloatingWindow(vcl::Window* pParent, WinBits nStyle = WB_STDFLOATWIN);
     explicit        FloatingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
                                    const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>());
-    virtual         ~FloatingWindow();
+    virtual         ~FloatingWindow() override;
     virtual void    dispose() override;
 
     virtual bool    Notify( NotifyEvent& rNEvt ) override;
diff --git a/include/vcl/fontcharmap.hxx b/include/vcl/fontcharmap.hxx
index 2e13274c8b41..15f08abac937 100644
--- a/include/vcl/fontcharmap.hxx
+++ b/include/vcl/fontcharmap.hxx
@@ -39,7 +39,7 @@ public:
      **/
     FontCharMap();
     FontCharMap( const CmapResult& rCR );
-    virtual ~FontCharMap();
+    virtual ~FontCharMap() override;
 
     /** Get the default font character map
 
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 16053e66af79..f7140627f052 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -122,7 +122,7 @@ public:
                     Graphic( const Animation& rAnimation );
                     Graphic( const GDIMetaFile& rMtf );
                     Graphic( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic );
-    virtual         ~Graphic();
+    virtual         ~Graphic() override;
 
     Graphic&        operator=( const Graphic& rGraphic );
     bool            operator==( const Graphic& rGraphic ) const;
diff --git a/include/vcl/introwin.hxx b/include/vcl/introwin.hxx
index e6a48ea6472e..502a84fd90d5 100644
--- a/include/vcl/introwin.hxx
+++ b/include/vcl/introwin.hxx
@@ -31,7 +31,7 @@ private:
 
 public:
                  IntroWindow();
-    virtual      ~IntroWindow();
+    virtual      ~IntroWindow() override;
     virtual void dispose() override;
 
 };
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index f10e66fca9c2..1713e646f5c8 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -398,7 +398,7 @@ public:
         , m_pLabel(nullptr)
     {
     }
-    virtual ~VclFrame();
+    virtual ~VclFrame() override;
     virtual void dispose() override;
     void set_label(const OUString &rLabel);
     OUString get_label() const;
@@ -453,7 +453,7 @@ public:
         m_pDisclosureButton->SetToggleHdl(LINK(this, VclExpander, ClickHdl));
         m_pDisclosureButton->Show();
     }
-    virtual ~VclExpander() { disposeOnce(); }
+    virtual ~VclExpander() override { disposeOnce(); }
     virtual void dispose() override;
     virtual vcl::Window *get_child() override;
     virtual const vcl::Window *get_child() const override;
@@ -486,7 +486,7 @@ class VCL_DLLPUBLIC VclScrolledWindow : public VclBin
 {
 public:
     VclScrolledWindow(vcl::Window *pParent );
-    virtual ~VclScrolledWindow() { disposeOnce(); }
+    virtual ~VclScrolledWindow() override { disposeOnce(); }
     virtual void dispose() override;
     virtual vcl::Window *get_child() override;
     virtual const vcl::Window *get_child() const override;
@@ -552,7 +552,7 @@ private:
     VclPtr<EventBoxHelper> m_aEventBoxHelper;
 protected:
     virtual void dispose() override;
-    virtual ~VclEventBox();
+    virtual ~VclEventBox() override;
 public:
     VclEventBox(vcl::Window* pParent)
         : VclBin(pParent)
@@ -674,7 +674,7 @@ public:
     OUString const & get_secondary_text() const;
     void set_primary_text(const OUString &rPrimaryString);
     void set_secondary_text(const OUString &rSecondaryString);
-    virtual ~MessageDialog();
+    virtual ~MessageDialog() override;
     virtual void dispose() override;
 
     static void SetMessagesWidths(vcl::Window *pParent, VclMultiLineEdit *pPrimaryMessage,
diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index 4f28b3254ef9..ca21f5c0ad08 100644
--- a/include/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.hxx
@@ -118,7 +118,7 @@ namespace vcl
         static bool is_less( vcl::Window* left, vcl::Window* right );
 
         LazyDeletor()  { LazyDelete::addDeletor( this ); }
-        virtual ~LazyDeletor()
+        virtual ~LazyDeletor() override
         {
             SAL_INFO("vcl.lazydelete", typeid(*this).name() << std::hex << this << " deleted");
             if( s_pOneInstance == this ) // sanity check
@@ -227,7 +227,7 @@ namespace vcl
         virtual void doCleanup() override { delete m_pT; m_pT = nullptr; }
     public:
         DeleteOnDeinit( T* i_pT ) : m_pT( i_pT ) { addDeinitContainer( this ); }
-        virtual ~DeleteOnDeinit() {}
+        virtual ~DeleteOnDeinit() override {}
 
         // get contents
         T* get() { return m_pT; }
@@ -261,7 +261,7 @@ namespace vcl
     public:
         DeleteUnoReferenceOnDeinit(const css::uno::Reference<I>& r_xI ) : m_xI( r_xI ) {
             addDeinitContainer( this ); }
-        virtual ~DeleteUnoReferenceOnDeinit() {}
+        virtual ~DeleteUnoReferenceOnDeinit() override {}
 
         css::uno::Reference<I> get() { return m_xI; }
 
diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx
index 011237c6d8ef..9913d1bf5f9c 100644
--- a/include/vcl/longcurr.hxx
+++ b/include/vcl/longcurr.hxx
@@ -46,7 +46,7 @@ protected:
 
                             LongCurrencyFormatter();
 public:
-                            virtual ~LongCurrencyFormatter();
+                            virtual ~LongCurrencyFormatter() override;
 
     virtual void            Reformat() override;
     virtual void            ReformatAll() override;
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index bba1eae5e576..aebdcb37b606 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -118,7 +118,7 @@ protected:
 public:
     explicit            ListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER );
     explicit            ListBox( vcl::Window* pParent, const ResId& );
-    virtual             ~ListBox();
+    virtual             ~ListBox() override;
     virtual void        dispose() override;
 
     virtual void        ApplySettings(vcl::RenderContext& rRenderContext) override;
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index efb55d52b65a..6504edc8befc 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -229,7 +229,7 @@ protected:
     Menu();
 
 public:
-    virtual ~Menu();
+    virtual ~Menu() override;
     virtual void dispose() override;
 
     void Activate();
@@ -427,7 +427,7 @@ protected:
 public:
     MenuBar();
     MenuBar( const MenuBar& rMenu );
-    virtual ~MenuBar();
+    virtual ~MenuBar() override;
     virtual void dispose() override;
 
     MenuBar& operator =( const MenuBar& rMenu );
@@ -509,7 +509,7 @@ public:
     PopupMenu();
     PopupMenu( const PopupMenu& rMenu );
     explicit PopupMenu( const ResId& );
-    virtual ~PopupMenu();
+    virtual ~PopupMenu() override;
     virtual void dispose() override;
 
     virtual bool IsMenuBar() const override { return false; }
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index c0abc93cd157..6c628aa6af96 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -54,7 +54,7 @@ protected:
 
 public:
     explicit        MenuButton( vcl::Window* pParent, WinBits nStyle = 0 );
-    virtual         ~MenuButton();
+    virtual         ~MenuButton() override;
     virtual void    dispose() override;
 
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) override;
@@ -82,7 +82,7 @@ class VCL_DLLPUBLIC MenuToggleButton : public MenuButton
 {
 public:
     explicit        MenuToggleButton( vcl::Window* pParent, WinBits nStyle = 0 );
-    virtual         ~MenuToggleButton();
+    virtual         ~MenuToggleButton() override;
 
     void            SetActive( bool bSel );
 };
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index af914d1b4b15..c7a26cd9727b 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -100,7 +100,7 @@ private:
 public:
                         MetaPixelAction();
 protected:
-    virtual             ~MetaPixelAction();
+    virtual             ~MetaPixelAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -124,7 +124,7 @@ private:
 public:
                         MetaPointAction();
 protected:
-    virtual             ~MetaPointAction();
+    virtual             ~MetaPointAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -150,7 +150,7 @@ private:
 public:
                         MetaLineAction();
 protected:
-    virtual             ~MetaLineAction();
+    virtual             ~MetaLineAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -178,7 +178,7 @@ private:
 public:
                         MetaRectAction();
 protected:
-    virtual             ~MetaRectAction();
+    virtual             ~MetaRectAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -204,7 +204,7 @@ private:
 public:
                         MetaRoundRectAction();
 protected:
-    virtual             ~MetaRoundRectAction();
+    virtual             ~MetaRoundRectAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -231,7 +231,7 @@ private:
 public:
                         MetaEllipseAction();
 protected:
-    virtual             ~MetaEllipseAction();
+    virtual             ~MetaEllipseAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -257,7 +257,7 @@ private:
 public:
                         MetaArcAction();
 protected:
-    virtual             ~MetaArcAction();
+    virtual             ~MetaArcAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -286,7 +286,7 @@ private:
 public:
                         MetaPieAction();
 protected:
-    virtual             ~MetaPieAction();
+    virtual             ~MetaPieAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -315,7 +315,7 @@ private:
 public:
                         MetaChordAction();
 protected:
-    virtual             ~MetaChordAction();
+    virtual             ~MetaChordAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -343,7 +343,7 @@ private:
 public:
                         MetaPolyLineAction();
 protected:
-    virtual             ~MetaPolyLineAction();
+    virtual             ~MetaPolyLineAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -369,7 +369,7 @@ private:
 public:
                         MetaPolygonAction();
 protected:
-    virtual             ~MetaPolygonAction();
+    virtual             ~MetaPolygonAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -393,7 +393,7 @@ private:
 public:
                         MetaPolyPolygonAction();
 protected:
-    virtual             ~MetaPolyPolygonAction();
+    virtual             ~MetaPolyPolygonAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -420,7 +420,7 @@ private:
 public:
                         MetaTextAction();
 protected:
-    virtual             ~MetaTextAction();
+    virtual             ~MetaTextAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -450,7 +450,7 @@ private:
     sal_Int32   mnLen;
 
 protected:
-    virtual             ~MetaTextArrayAction();
+    virtual             ~MetaTextArrayAction() override;
 
 public:
                         MetaTextArrayAction();
@@ -489,7 +489,7 @@ private:
 public:
                         MetaStretchTextAction();
 protected:
-    virtual             ~MetaStretchTextAction();
+    virtual             ~MetaStretchTextAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -521,7 +521,7 @@ private:
 public:
                         MetaTextRectAction();
 protected:
-    virtual             ~MetaTextRectAction();
+    virtual             ~MetaTextRectAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -552,7 +552,7 @@ private:
 public:
                         MetaTextLineAction();
 protected:
-    virtual             ~MetaTextLineAction();
+    virtual             ~MetaTextLineAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -583,7 +583,7 @@ private:
 public:
                         MetaBmpAction();
 protected:
-    virtual             ~MetaBmpAction();
+    virtual             ~MetaBmpAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -610,7 +610,7 @@ private:
 public:
                         MetaBmpScaleAction();
 protected:
-    virtual             ~MetaBmpScaleAction();
+    virtual             ~MetaBmpScaleAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -641,7 +641,7 @@ private:
 public:
                         MetaBmpScalePartAction();
 protected:
-    virtual             ~MetaBmpScalePartAction();
+    virtual             ~MetaBmpScalePartAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -672,7 +672,7 @@ private:
 public:
                         MetaBmpExAction();
 protected:
-    virtual             ~MetaBmpExAction();
+    virtual             ~MetaBmpExAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -699,7 +699,7 @@ private:
 public:
                         MetaBmpExScaleAction();
 protected:
-    virtual             ~MetaBmpExScaleAction();
+    virtual             ~MetaBmpExScaleAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -730,7 +730,7 @@ private:
 public:
                         MetaBmpExScalePartAction();
 protected:
-    virtual             ~MetaBmpExScalePartAction();
+    virtual             ~MetaBmpExScalePartAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -762,7 +762,7 @@ private:
 public:
                         MetaMaskAction();
 protected:
-    virtual             ~MetaMaskAction();
+    virtual             ~MetaMaskAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -793,7 +793,7 @@ private:
 public:
                         MetaMaskScaleAction();
 protected:
-    virtual             ~MetaMaskScaleAction();
+    virtual             ~MetaMaskScaleAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -827,7 +827,7 @@ private:
 public:
                         MetaMaskScalePartAction();
 protected:
-    virtual             ~MetaMaskScalePartAction();
+    virtual             ~MetaMaskScalePartAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -860,7 +860,7 @@ private:
 public:
                         MetaGradientAction();
 protected:
-    virtual             ~MetaGradientAction();
+    virtual             ~MetaGradientAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -886,7 +886,7 @@ private:
 public:
                         MetaGradientExAction();
 protected:
-    virtual             ~MetaGradientExAction();
+    virtual             ~MetaGradientExAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -912,7 +912,7 @@ private:
 public:
                         MetaHatchAction();
 protected:
-    virtual             ~MetaHatchAction();
+    virtual             ~MetaHatchAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -938,7 +938,7 @@ private:
 public:
                         MetaWallpaperAction();
 protected:
-    virtual             ~MetaWallpaperAction();
+    virtual             ~MetaWallpaperAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -965,7 +965,7 @@ private:
 public:
                         MetaClipRegionAction();
 protected:
-    virtual             ~MetaClipRegionAction();
+    virtual             ~MetaClipRegionAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -990,7 +990,7 @@ private:
 public:
                         MetaISectRectClipRegionAction();
 protected:
-    virtual             ~MetaISectRectClipRegionAction();
+    virtual             ~MetaISectRectClipRegionAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1014,7 +1014,7 @@ private:
 public:
                         MetaISectRegionClipRegionAction();
 protected:
-    virtual             ~MetaISectRegionClipRegionAction();
+    virtual             ~MetaISectRegionClipRegionAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1039,7 +1039,7 @@ private:
 public:
                         MetaMoveClipRegionAction();
 protected:
-    virtual             ~MetaMoveClipRegionAction();
+    virtual             ~MetaMoveClipRegionAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1064,7 +1064,7 @@ private:
 public:
                         MetaLineColorAction();
 protected:
-    virtual             ~MetaLineColorAction();
+    virtual             ~MetaLineColorAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1087,7 +1087,7 @@ private:
 public:
                         MetaFillColorAction();
 protected:
-    virtual             ~MetaFillColorAction();
+    virtual             ~MetaFillColorAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1109,7 +1109,7 @@ private:
 public:
                         MetaTextColorAction();
 protected:
-    virtual             ~MetaTextColorAction();
+    virtual             ~MetaTextColorAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1131,7 +1131,7 @@ private:
 public:
                         MetaTextFillColorAction();
 protected:
-    virtual             ~MetaTextFillColorAction();
+    virtual             ~MetaTextFillColorAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1154,7 +1154,7 @@ private:
 public:
                         MetaTextLineColorAction();
 protected:
-    virtual             ~MetaTextLineColorAction();
+    virtual             ~MetaTextLineColorAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1177,7 +1177,7 @@ private:
 public:
                         MetaOverlineColorAction();
 protected:
-    virtual             ~MetaOverlineColorAction();
+    virtual             ~MetaOverlineColorAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1199,7 +1199,7 @@ private:
 public:
                         MetaTextAlignAction();
 protected:
-    virtual             ~MetaTextAlignAction();
+    virtual             ~MetaTextAlignAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1220,7 +1220,7 @@ private:
 public:
                         MetaMapModeAction();
 protected:
-    virtual             ~MetaMapModeAction();
+    virtual             ~MetaMapModeAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1243,7 +1243,7 @@ private:
 public:
                         MetaFontAction();
 protected:
-    virtual             ~MetaFontAction();
+    virtual             ~MetaFontAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1266,7 +1266,7 @@ private:
 public:
                         MetaPushAction();
 protected:
-    virtual             ~MetaPushAction();
+    virtual             ~MetaPushAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1284,7 +1284,7 @@ public:
 
                         MetaPopAction();
 protected:
-    virtual             ~MetaPopAction();
+    virtual             ~MetaPopAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1301,7 +1301,7 @@ private:
 public:
                         MetaRasterOpAction();
 protected:
-    virtual             ~MetaRasterOpAction();
+    virtual             ~MetaRasterOpAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1323,7 +1323,7 @@ private:
 public:
                         MetaTransparentAction();
 protected:
-    virtual             ~MetaTransparentAction();
+    virtual             ~MetaTransparentAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1351,7 +1351,7 @@ private:
 public:
                         MetaFloatTransparentAction();
 protected:
-    virtual             ~MetaFloatTransparentAction();
+    virtual             ~MetaFloatTransparentAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1382,7 +1382,7 @@ private:
 public:
                         MetaEPSAction();
 protected:
-    virtual             ~MetaEPSAction();
+    virtual             ~MetaEPSAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1411,7 +1411,7 @@ private:
 public:
                         MetaRefPointAction();
 protected:
-    virtual             ~MetaRefPointAction();
+    virtual             ~MetaRefPointAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1436,7 +1436,7 @@ private:
     SAL_DLLPRIVATE void ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 nDataSize );
 
 protected:
-    virtual             ~MetaCommentAction();
+    virtual             ~MetaCommentAction() override;
 
 public:
     explicit            MetaCommentAction();
@@ -1466,7 +1466,7 @@ private:
 public:
                         MetaLayoutModeAction();
 protected:
-    virtual             ~MetaLayoutModeAction();
+    virtual             ~MetaLayoutModeAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
@@ -1487,7 +1487,7 @@ private:
 public:
                         MetaTextLanguageAction();
 protected:
-    virtual             ~MetaTextLanguageAction();
+    virtual             ~MetaTextLanguageAction() override;
 public:
     virtual void        Execute( OutputDevice* pOut ) override;
     virtual MetaAction* Clone() override;
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 72992744963b..0c96e0be67c5 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -36,7 +36,7 @@ class VCL_DLLPUBLIC FontMetric : public vcl::Font
 public:
     explicit            FontMetric();
                         FontMetric( const FontMetric& );  // TODO make this explicit
-    virtual             ~FontMetric();
+    virtual             ~FontMetric() override;
 
     FontType            GetType() const;
 
diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx
index f37f3093509d..20a76cb17ba1 100644
--- a/include/vcl/morebtn.hxx
+++ b/include/vcl/morebtn.hxx
@@ -45,7 +45,7 @@ protected:
 
 public:
     explicit            MoreButton( vcl::Window* pParent, WinBits nStyle = 0 );
-    virtual             ~MoreButton();
+    virtual             ~MoreButton() override;
     virtual void        dispose() override;
 
     void                Click() override;
diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx
index 802da7da9706..225e96bfdedb 100644
--- a/include/vcl/msgbox.hxx
+++ b/include/vcl/msgbox.hxx
@@ -47,7 +47,7 @@ protected:
 public:
                         MessBox( vcl::Window* pParent, WinBits nStyle,
                                  const OUString& rTitle, const OUString& rMessage );
-    virtual             ~MessBox();
+    virtual             ~MessBox() override;
     virtual void        dispose() override;
 
     virtual void        StateChanged( StateChangedType nStateChange ) override;
diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx
index d2a279ffe3ad..3f22162622af 100644
--- a/include/vcl/notebookbar.hxx
+++ b/include/vcl/notebookbar.hxx
@@ -22,7 +22,7 @@ class VCL_DLLPUBLIC NotebookBar : public Control, public VclBuilderContainer
 friend class NotebookBarContextChangeEventListener;
 public:
     NotebookBar(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame);
-    virtual ~NotebookBar();
+    virtual ~NotebookBar() override;
     virtual void dispose() SAL_OVERRIDE;
 
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
diff --git a/include/vcl/oldprintadaptor.hxx b/include/vcl/oldprintadaptor.hxx
index 8f04f195a45f..bd65f4d2ce27 100644
--- a/include/vcl/oldprintadaptor.hxx
+++ b/include/vcl/oldprintadaptor.hxx
@@ -30,7 +30,7 @@ namespace vcl
         ImplOldStyleAdaptorData*    mpData;
     public:
         OldStylePrintAdaptor( const VclPtr< Printer >& );
-        virtual ~OldStylePrintAdaptor();
+        virtual ~OldStylePrintAdaptor() override;
 
         void StartPage();
         void EndPage();
diff --git a/include/vcl/openglwin.hxx b/include/vcl/openglwin.hxx
index cac81a6968ea..e04c0984163a 100644
--- a/include/vcl/openglwin.hxx
+++ b/include/vcl/openglwin.hxx
@@ -34,7 +34,7 @@ class VCL_DLLPUBLIC OpenGLWindow : public vcl::Window
 {
 public:
                    OpenGLWindow(vcl::Window* pParent, bool bInit = true);
-    virtual        ~OpenGLWindow();
+    virtual        ~OpenGLWindow() override;
     virtual void   dispose() override;
 
     OpenGLContext& getContext();
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 56f449bde538..88b1233cbc56 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -415,7 +415,7 @@ private:
 
 protected:
                                 OutputDevice();
-    virtual                     ~OutputDevice();
+    virtual                     ~OutputDevice() override;
     virtual void                dispose() override;
 
 public:
diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx
index 100c8b4a5744..a4901ca04dc7 100644
--- a/include/vcl/pdfextoutdevdata.hxx
+++ b/include/vcl/pdfextoutdevdata.hxx
@@ -98,7 +98,7 @@ class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData
 public:
 
     PDFExtOutDevData( const OutputDevice& rOutDev );
-    virtual ~PDFExtOutDevData();
+    virtual ~PDFExtOutDevData() override;
 
     bool PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction );
     void ResetSyncData();
diff --git a/include/vcl/popupmenuwindow.hxx b/include/vcl/popupmenuwindow.hxx
index 9184c3875838..dcfcb9f84345 100644
--- a/include/vcl/popupmenuwindow.hxx
+++ b/include/vcl/popupmenuwindow.hxx
@@ -29,7 +29,7 @@ private:
     ImplData* mpImplData;
 public:
     PopupMenuFloatingWindow( vcl::Window* pParent );
-    virtual ~PopupMenuFloatingWindow();
+    virtual ~PopupMenuFloatingWindow() override;
     virtual void dispose() override;
 
     sal_uInt16      GetMenuStackLevel() const;
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 809f16497489..704f3514663e 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -272,7 +272,7 @@ public:
                                 Printer( const JobSetup& rJobSetup );
                                 Printer( const QueueInfo& rQueueInfo );
                                 Printer( const OUString& rPrinterName );
-    virtual                     ~Printer();
+    virtual                     ~Printer() override;
     virtual void                dispose() override;
 
     static const std::vector< OUString >&
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 61609ab4acd1..72bae8843207 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -365,7 +365,7 @@ class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue
             mnButton1State = ControlState::NONE; mnButton2State = ControlState::NONE;
             mnThumbState = ControlState::NONE; mnPage1State = ControlState::NONE; mnPage2State = ControlState::NONE;
         };
-        virtual ~ScrollbarValue();
+        virtual ~ScrollbarValue() override;
         virtual ScrollbarValue* clone() const override;
 };
 
@@ -382,7 +382,7 @@ class VCL_DLLPUBLIC SliderValue : public ImplControlValue
         : ImplControlValue( ControlType::Slider, 0 )
         , mnMin( 0 ), mnMax( 0 ), mnCur( 0 ), mnThumbState( ControlState::NONE )
         {}
-        virtual ~SliderValue();
+        virtual ~SliderValue() override;
         virtual SliderValue* clone() const override;
 };
 
@@ -417,7 +417,7 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue
             , maContentRect(rContentRect)
         {
         }
-        virtual ~TabitemValue();
+        virtual ~TabitemValue() override;
         virtual TabitemValue* clone() const override;
 
         bool isLeftAligned() const  { return bool(mnAlignment & TabitemFlags::LeftAligned); }
@@ -454,7 +454,7 @@ class VCL_DLLPUBLIC SpinbuttonValue : public ImplControlValue
         {
         }
 
-        virtual ~SpinbuttonValue();
+        virtual ~SpinbuttonValue() override;
         virtual SpinbuttonValue* clone() const override;
 };
 
@@ -467,7 +467,7 @@ class VCL_DLLPUBLIC ToolbarValue : public ImplControlValue
 public:
     ToolbarValue() : ImplControlValue( ControlType::Toolbar, 0 )
     { mbIsTopDockingArea = false; }
-    virtual ~ToolbarValue();
+    virtual ~ToolbarValue() override;
     virtual ToolbarValue* clone() const override;
     Rectangle           maGripRect;
     bool                mbIsTopDockingArea; // indicates that this is the top aligned dockingarea
@@ -483,7 +483,7 @@ class VCL_DLLPUBLIC MenubarValue : public ImplControlValue
 public:
     MenubarValue() : ImplControlValue( ControlType::Menubar, 0 )
     { maTopDockingAreaHeight=0; }
-    virtual ~MenubarValue();
+    virtual ~MenubarValue() override;
     virtual MenubarValue* clone() const override;
     int             maTopDockingAreaHeight;
 };
@@ -500,7 +500,7 @@ public:
     : ImplControlValue( ControlType::MenuPopup, i_nGutterWidth )
     , maItemRect( i_rItemRect )
     {}
-    virtual ~MenupopupValue();
+    virtual ~MenupopupValue() override;
     virtual MenupopupValue* clone() const override;
     Rectangle       maItemRect;
 };
@@ -515,7 +515,7 @@ public:
     PushButtonValue()
     : ImplControlValue( ControlType::Pushbutton, 0 )
     , mbBevelButton( false ), mbSingleLine( true ) {}
-    virtual ~PushButtonValue();
+    virtual ~PushButtonValue() override;
     virtual PushButtonValue* clone() const override;
 
     bool            mbBevelButton:1;
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index dd06512e1359..897f13f41a95 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -88,7 +88,7 @@ private:
 
 public:
     explicit        ScrollBar( vcl::Window* pParent, WinBits nStyle = WB_VERT );
-    virtual         ~ScrollBar();
+    virtual         ~ScrollBar() override;
     virtual void    dispose() override;
 
     virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index 5b9cd1506a71..09ead4dd280e 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -80,7 +80,7 @@ private:
 
 public:
                     Slider( vcl::Window* pParent, WinBits nStyle = WB_HORZ );
-    virtual         ~Slider();
+    virtual         ~Slider() override;
     virtual void    dispose() override;
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) override;
     virtual void    MouseButtonUp( const MouseEvent& rMEvt ) override;
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index 17e0c82f050a..503bcb17c5ab 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -68,7 +68,7 @@ protected:
 public:
     explicit        SpinField( vcl::Window* pParent, WinBits nWinStyle = 0 );
     explicit        SpinField( vcl::Window* pParent, const ResId& );
-    virtual         ~SpinField();
+    virtual         ~SpinField() override;
     virtual void    dispose() override;
 
     virtual bool    ShowDropDown( bool bShow );
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index 9d92b47d43b9..13f9ad7c19c2 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -61,7 +61,7 @@ protected:
 
 public:
     explicit            Splitter( vcl::Window* pParent, WinBits nStyle = WB_VSCROLL );
-    virtual             ~Splitter();
+    virtual             ~Splitter() override;
     virtual void        dispose() override;
 
     void                StartSplit();
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 920b02e96275..1f246886dc69 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -123,7 +123,7 @@ private:
                         SplitWindow & operator= (const SplitWindow &) = delete;
 public:
                         SplitWindow( vcl::Window* pParent, WinBits nStyle = 0 );
-    virtual             ~SplitWindow();
+    virtual             ~SplitWindow() override;
     virtual void        dispose() override;
 
     virtual void        StartSplit();
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index e8fa7c0876d7..a270663ed362 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -104,7 +104,7 @@ protected:
 public:
                         StatusBar( vcl::Window* pParent,
                                    WinBits nWinStyle = WB_BORDER | WB_RIGHT );
-    virtual             ~StatusBar();
+    virtual             ~StatusBar() override;
     virtual void        dispose() override;
 
     void                AdjustItemWidthsForHiDPI();
diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx
index b04e6f662bfa..e4142c8b72df 100644
--- a/include/vcl/syschild.hxx
+++ b/include/vcl/syschild.hxx
@@ -40,7 +40,7 @@ public:
     explicit                SystemChildWindow( vcl::Window* pParent, WinBits nStyle = 0 );
                             // create a SystemChildWindow using the given SystemWindowData
     explicit                SystemChildWindow( vcl::Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = true );
-    virtual                 ~SystemChildWindow();
+    virtual                 ~SystemChildWindow() override;
     virtual void            dispose() override;
 
     virtual const SystemEnvData* GetSystemData() const override;
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 1d98a3d9b246..211a4e90684c 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -192,7 +192,7 @@ protected:
 
     SAL_DLLPRIVATE void DoInitialLayout();
 public:
-    virtual         ~SystemWindow();
+    virtual         ~SystemWindow() override;
     virtual void    dispose() override;
 
     virtual bool    Notify( NotifyEvent& rNEvt ) override;
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 0be854f38699..ea9ea42a9cbf 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -92,7 +92,7 @@ protected:
 public:
                         TabControl( vcl::Window* pParent,
                                     WinBits nStyle = WB_STDTABCONTROL );
-                        virtual ~TabControl();
+                        virtual ~TabControl() override;
     virtual void        dispose() override;
 
     virtual void        MouseButtonDown( const MouseEvent& rMEvt ) override;
diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx
index a3c06017b833..0849cc83587f 100644
--- a/include/vcl/tabdlg.hxx
+++ b/include/vcl/tabdlg.hxx
@@ -41,7 +41,7 @@ public:
                         TabDialog( vcl::Window* pParent,
                                    WinBits nStyle = WB_STDTABDIALOG );
                         TabDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
-    virtual             ~TabDialog();
+    virtual             ~TabDialog() override;
     virtual void        dispose() override;
 
     virtual void        StateChanged( StateChangedType nStateChange ) override;
diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx
index 0ee6776cca6f..edf9da15d52f 100644
--- a/include/vcl/tabpage.hxx
+++ b/include/vcl/tabpage.hxx
@@ -40,7 +40,7 @@ private:
 public:
     explicit        TabPage( vcl::Window* pParent, WinBits nStyle = 0 );
     explicit        TabPage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription );
-    virtual         ~TabPage();
+    virtual         ~TabPage() override;
     virtual void    dispose() override;
 
     virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 79bf8ad3b388..a2bd788e4a70 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -220,7 +220,7 @@ protected:
 
 public:
                         TextEngine();
-                        virtual ~TextEngine();
+                        virtual ~TextEngine() override;
 
     void                SetText( const OUString& rStr );
     OUString            GetText( LineEnd aSeparator = LINEEND_LF ) const;
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index bf9d229c114d..6eef0f99ea89 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -96,7 +96,7 @@ protected:
 
 public:
                         TextView( TextEngine* pEng, vcl::Window* pWindow );
-    virtual            ~TextView();
+    virtual            ~TextView() override;
 
     TextEngine*         GetTextEngine() const;
     vcl::Window*             GetWindow() const;
diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx
index 1ab8ce62906c..f98f891e7cba 100644
--- a/include/vcl/throbber.hxx
+++ b/include/vcl/throbber.hxx
@@ -47,7 +47,7 @@ public:
 
 public:
     Throbber(vcl::Window* i_parentWindow, WinBits i_style);
-    virtual ~Throbber();
+    virtual ~Throbber() override;
     virtual void dispose() override;
 
     // Properties
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 28a70451217d..ca913c8aaa6f 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -261,7 +261,7 @@ public:
     ToolBox( vcl::Window* pParent, const ResId& rResId );
     ToolBox(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
         const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>());
-    virtual             ~ToolBox();
+    virtual             ~ToolBox() override;
     virtual void        dispose() override;
 
     virtual void        Click();
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index ee6862ced477..cab94b248e0b 100644
--- a/include/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
@@ -67,7 +67,7 @@ private:
 public:
                             TextAttribFontColor( const Color& rColor );
                             TextAttribFontColor( const TextAttribFontColor& rAttr );
-                            virtual ~TextAttribFontColor();
+                            virtual ~TextAttribFontColor() override;
 
     const Color&            GetColor() const { return maColor; }
 
@@ -85,7 +85,7 @@ private:
 public:
                             TextAttribFontWeight( FontWeight eWeight );
                             TextAttribFontWeight( const TextAttribFontWeight& rAttr );
-                            virtual ~TextAttribFontWeight();
+                            virtual ~TextAttribFontWeight() override;
 
     virtual void            SetFont( vcl::Font& rFont ) const override;
     virtual TextAttrib*     Clone() const override;
@@ -104,7 +104,7 @@ private:
 
 public:
                             TextAttribHyperLink( const TextAttribHyperLink& rAttr );
-                            virtual ~TextAttribHyperLink();
+                            virtual ~TextAttribHyperLink() override;
 
     const OUString&         GetURL() const                              { return maURL; }
     virtual void            SetFont( vcl::Font& rFont ) const override;
@@ -117,7 +117,7 @@ class VCL_DLLPUBLIC TextAttribProtect : public TextAttrib
 public:
                             TextAttribProtect();
                             TextAttribProtect( const TextAttribProtect& rAttr );
-                            virtual ~TextAttribProtect();
+                            virtual ~TextAttribProtect() override;
 
     virtual void            SetFont( vcl::Font& rFont ) const override;
     virtual TextAttrib*     Clone() const override;
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index a8c35be7285b..d9d683179986 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -129,7 +129,7 @@ class UITEST_DLLPUBLIC ButtonUIObject : public WindowUIObject
 public:
 
     ButtonUIObject(VclPtr<Button> xButton);
-    virtual ~ButtonUIObject();
+    virtual ~ButtonUIObject() override;
 
     virtual StringMap get_state() override;
 
@@ -150,7 +150,7 @@ class UITEST_DLLPUBLIC DialogUIObject : public WindowUIObject
 public:
 
     DialogUIObject(VclPtr<Dialog> xDialog);
-    virtual ~DialogUIObject();
+    virtual ~DialogUIObject() override;
 
     virtual StringMap get_state() override;
 
@@ -168,7 +168,7 @@ class UITEST_DLLPUBLIC EditUIObject : public WindowUIObject
 public:
 
     EditUIObject(VclPtr<Edit> xEdit);
-    virtual ~EditUIObject();
+    virtual ~EditUIObject() override;
 
     virtual void execute(const OUString& rAction,
             const StringMap& rParameters) override;
@@ -190,7 +190,7 @@ private:
 
 public:
     CheckBoxUIObject(VclPtr<CheckBox> xCheckbox);
-    virtual ~CheckBoxUIObject();
+    virtual ~CheckBoxUIObject() override;
 
     virtual void execute(const OUString& rAction,
             const StringMap& rParameters) override;
@@ -211,7 +211,7 @@ private:
 
 public:
     RadioButtonUIObject(VclPtr<RadioButton> xCheckbox);
-    virtual ~RadioButtonUIObject();
+    virtual ~RadioButtonUIObject() override;
 
     virtual void execute(const OUString& rAction,
             const StringMap& rParameters) override;
@@ -231,7 +231,7 @@ private:
     VclPtr<TabPage> mxTabPage;
 public:
     TabPageUIObject(VclPtr<TabPage> xTabPage);
-    virtual ~TabPageUIObject();
+    virtual ~TabPageUIObject() override;
 
     virtual void execute(const OUString& rAction,
             const StringMap& rParameters) override;
@@ -253,7 +253,7 @@ private:
 public:
 
     ListBoxUIObject(VclPtr<ListBox> xListBox);
-    virtual ~ListBoxUIObject();
+    virtual ~ListBoxUIObject() override;
 
     virtual void execute(const OUString& rAction,
             const StringMap& rParameters) override;
@@ -276,7 +276,7 @@ private:
 public:
 
     ComboBoxUIObject(VclPtr<ComboBox> xListBox);
-    virtual ~ComboBoxUIObject();
+    virtual ~ComboBoxUIObject() override;
 
     virtual void execute(const OUString& rAction,
             const StringMap& rParameters) override;
@@ -298,7 +298,7 @@ private:
 public:
 
     SpinUIObject(VclPtr<SpinButton> xSpinButton);
-    virtual ~SpinUIObject();
+    virtual ~SpinUIObject() override;
 
     virtual void execute(const OUString& rAction,
             const StringMap& rParameters) override;
@@ -319,7 +319,7 @@ class UITEST_DLLPUBLIC SpinFieldUIObject : public EditUIObject
 public:
 
     SpinFieldUIObject(VclPtr<SpinField> xEdit);
-    virtual ~SpinFieldUIObject();
+    virtual ~SpinFieldUIObject() override;
 
     virtual void execute(const OUString& rAction,
             const StringMap& rParameters) override;
@@ -341,7 +341,7 @@ private:
 public:
 
     TabControlUIObject(VclPtr<TabControl> mxTabControl);
-    virtual ~TabControlUIObject();
+    virtual ~TabControlUIObject() override;
 
     virtual void execute(const OUString& rAction,
             const StringMap& rParameters) override;
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index abd5f62ec2bf..7b7ebe91d6f3 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -41,7 +41,7 @@ namespace vcl { namespace unohelper {
 
     public:
                         TextDataObject( const OUString& rText );
-                        virtual ~TextDataObject();
+                        virtual ~TextDataObject() override;
 
         OUString&       GetString() { return maText; }
 
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 7c1cd5ea1606..232162b76542 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -213,7 +213,7 @@ private:
 
 public:
     VclWindowEvent( vcl::Window* pWin, sal_uLong n, void* pDat = nullptr );
-    virtual ~VclWindowEvent();
+    virtual ~VclWindowEvent() override;
 
     vcl::Window* GetWindow() const { return pWindow; }
     void*   GetData() const { return pData; }
@@ -230,7 +230,7 @@ private:
 
 public:
     VclMenuEvent( Menu* pM, sal_uLong n, sal_uInt16 nPos );
-    virtual ~VclMenuEvent();
+    virtual ~VclMenuEvent() override;
 
     Menu* GetMenu() const;
     sal_uInt16 GetItemPos() const { return mnPos; }
@@ -240,7 +240,7 @@ class VCL_DLLPUBLIC VclAccessibleEvent: public VclSimpleEvent
 {
 public:
     VclAccessibleEvent( sal_uLong n, const css::uno::Reference< css::accessibility::XAccessible >& rxAccessible );
-    virtual ~VclAccessibleEvent();
+    virtual ~VclAccessibleEvent() override;
     const css::uno::Reference< css::accessibility::XAccessible >& GetAccessible() const { return mxAccessible;}
 
 private:
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 436195f64a7c..89d07c50f624 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -60,7 +60,7 @@ protected:
 public:
                     VclMultiLineEdit( vcl::Window* pParent,
                                       WinBits nWinStyle = WB_LEFT | WB_BORDER );
-    virtual         ~VclMultiLineEdit();
+    virtual         ~VclMultiLineEdit() override;
     virtual void    dispose() override;
 
     void            SelectionChanged();
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 3ec857345df7..88792f10dfa3 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -123,7 +123,7 @@ public:
     explicit            VirtualDevice(const SystemGraphicsData *pData, const Size &rSize,
                                       DeviceFormat eFormat);
 
-    virtual             ~VirtualDevice();
+    virtual             ~VirtualDevice() override;
     virtual void        dispose() override;
 
     virtual void        EnableRTL( bool bEnable = true ) override;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index d69a66ce360c..e638c6095cd7 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -791,7 +791,7 @@ public:
     explicit                            Window( vcl::Window* pParent, WinBits nStyle = 0 );
 
                                         Window( vcl::Window* pParent, const ResId& rResId );
-    virtual                             ~Window();
+    virtual                             ~Window() override;
 
     ::OutputDevice const*               GetOutDev() const;
     ::OutputDevice*                     GetOutDev();
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index efaa697634f5..e95a7664ad07 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -69,7 +69,7 @@ public:
     explicit        WorkWindow( vcl::Window* pParent, WinBits nStyle = WB_STDWORK );
     explicit        WorkWindow( vcl::Window* pParent, const css::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK );
     explicit        WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version
-    virtual         ~WorkWindow();
+    virtual         ~WorkWindow() override;
     virtual void    dispose() override;
 
     virtual bool    Close() override;
diff --git a/include/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx
index f7fd91e06cd2..565872ee1be2 100644
--- a/include/vcl/xtextedt.hxx
+++ b/include/vcl/xtextedt.hxx
@@ -37,7 +37,7 @@ private:
 
 public:
                         ExtTextEngine();
-                        virtual ~ExtTextEngine();
+                        virtual ~ExtTextEngine() override;
 
     TextSelection       MatchGroup( const TextPaM& rCursor ) const;
     bool                Search( TextSelection& rSel, const css::util::SearchOptions& rSearchOptions, bool bForward = true );
@@ -50,7 +50,7 @@ protected:
 
 public:
                     ExtTextView( ExtTextEngine* pEng, vcl::Window* pWindow );
-                    virtual ~ExtTextView();
+                    virtual ~ExtTextView() override;
 
     bool            MatchGroup();