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

100 files changed, 126 insertions, 126 deletions

diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 3e7f79ed095b..f960d6529a7e 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -117,7 +117,7 @@ public:
 
     void SetDropCapsPage(SwDropCapsPage* pPage) { mpPage = pPage; }
 
-    virtual ~SwDropCapsPict();
+    virtual ~SwDropCapsPict() override;
     virtual void dispose() override;
 
     void UpdatePaintSettings();       // also invalidates control!
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 6bb081e06a4f..25fd3feedfb5 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -71,7 +71,7 @@ class SwTestAccountSettingsDialog : public SfxModalDialog
     DECL_LINK_TYPED(TestHdl, void*, void);
 public:
     explicit SwTestAccountSettingsDialog(SwMailConfigPage* pParent);
-    virtual ~SwTestAccountSettingsDialog();
+    virtual ~SwTestAccountSettingsDialog() override;
     virtual void dispose() override;
 };
 
@@ -111,7 +111,7 @@ class SwAuthenticationSettingsDialog : public SfxModalDialog
 
 public:
     SwAuthenticationSettingsDialog(SwMailConfigPage* pParent, SwMailMergeConfigItem& rItem);
-    virtual ~SwAuthenticationSettingsDialog();
+    virtual ~SwAuthenticationSettingsDialog() override;
     virtual void dispose() override;
 };
 
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index cfb8438123bf..40f0fad410eb 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -86,7 +86,7 @@ class SwAddressListDialog : public SfxModalDialog
 
 public:
     SwAddressListDialog(SwMailMergeAddressBlockPage* pParent);
-    virtual ~SwAddressListDialog();
+    virtual ~SwAddressListDialog() override;
     virtual void dispose() override;
 
     css::uno::Reference< css::sdbc::XDataSource>
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index a615eead2b72..e5a3354af2b3 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -72,7 +72,7 @@ class SwAddressControl_Impl : public Control
 
 public:
     SwAddressControl_Impl(vcl::Window* pParent , WinBits nBits );
-    virtual ~SwAddressControl_Impl();
+    virtual ~SwAddressControl_Impl() override;
     virtual void dispose() override;
 
     void        SetData(SwCSVData& rDBData);
diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx
index 6398cc89fddc..cd03f78f7194 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.hxx
@@ -75,7 +75,7 @@ class SwCreateAddressListDialog : public SfxModalDialog
 public:
     SwCreateAddressListDialog(
             vcl::Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig);
-    virtual ~SwCreateAddressListDialog();
+    virtual ~SwCreateAddressListDialog() override;
     virtual void dispose() override;
 
     const OUString&         GetURL() const {    return m_sURL;    }
@@ -99,7 +99,7 @@ class SwFindEntryDialog : public ModelessDialog
 
 public:
     SwFindEntryDialog(SwCreateAddressListDialog* pParent);
-    virtual ~SwFindEntryDialog();
+    virtual ~SwFindEntryDialog() override;
     virtual void dispose() override;
 
     ListBox& GetFieldsListBox()
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
index c0d58660b906..ab27eb4db9d9 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
@@ -48,7 +48,7 @@ class SwCustomizeAddressListDialog : public SfxModalDialog
     void UpdateButtons();
 public:
     SwCustomizeAddressListDialog(vcl::Window* pParent, const SwCSVData& rOldData);
-    virtual ~SwCustomizeAddressListDialog();
+    virtual ~SwCustomizeAddressListDialog() override;
     virtual void dispose() override;
 
     SwCSVData*    GetNewData() { return m_pNewData;}
@@ -64,7 +64,7 @@ class SwAddRenameEntryDialog : public SfxModalDialog
 protected:
     SwAddRenameEntryDialog(vcl::Window* pParent, const OUString& rID,
         const OUString& rUIXMLDescription, const std::vector< OUString >& rCSVHeader);
-    virtual ~SwAddRenameEntryDialog();
+    virtual ~SwAddRenameEntryDialog() override;
     virtual void dispose() override;
 
 public:
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
index 166b0cacb1cc..6d217eba41e6 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
@@ -38,7 +38,7 @@ class SwDBTablePreviewDialog : public SfxModalDialog
 public:
     SwDBTablePreviewDialog(vcl::Window* pParent,
             css::uno::Sequence< css::beans::PropertyValue>& rValues  );
-    virtual ~SwDBTablePreviewDialog();
+    virtual ~SwDBTablePreviewDialog() override;
     virtual void dispose() override;
 
 };
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 767aa9a79d09..4637a3cff083 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -820,7 +820,7 @@ class SwAssignFieldsControl : public Control
     void                MakeVisible( sal_Int32 nIndex );
 public:
     SwAssignFieldsControl(vcl::Window* pParent, WinBits nBits);
-    virtual ~SwAssignFieldsControl();
+    virtual ~SwAssignFieldsControl() override;
     virtual void dispose() override;
 
     void        Init(SwMailMergeConfigItem& rConfigItem);
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 28861b9b3cd9..aa2bb64eddd8 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -81,7 +81,7 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage
 
 public:
     SwMailMergeAddressBlockPage(SwMailMergeWizard* _pParent);
-    virtual ~SwMailMergeAddressBlockPage();
+    virtual ~SwMailMergeAddressBlockPage() override;
     virtual void dispose() override;
     SwMailMergeWizard* GetWizard() { return m_pWizard; }
 };
@@ -109,7 +109,7 @@ class SwSelectAddressBlockDialog : public SfxModalDialog
 
 public:
     SwSelectAddressBlockDialog(vcl::Window* pParent, SwMailMergeConfigItem& rConfig);
-    virtual ~SwSelectAddressBlockDialog();
+    virtual ~SwSelectAddressBlockDialog() override;
     virtual void dispose() override;
 
     void         SetAddressBlocks(const css::uno::Sequence< OUString>& rBlocks,
@@ -127,7 +127,7 @@ class DDListBox : public SvTreeListBox
     VclPtr<SwCustomizeAddressBlockDialog>   m_pParentDialog;
 public:
     DDListBox(vcl::Window* pParent, const WinBits nStyle);
-    virtual ~DDListBox();
+    virtual ~DDListBox() override;
     virtual void dispose() override;
 
     void SetAddressDialog(SwCustomizeAddressBlockDialog *pParent);
@@ -159,7 +159,7 @@ protected:
     bool            PreNotify( NotifyEvent& rNEvt ) override;
 public:
     AddressMultiLineEdit(vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER);
-    virtual ~AddressMultiLineEdit();
+    virtual ~AddressMultiLineEdit() override;
     virtual void    dispose() override;
 
     void            SetAddressDialog(SwCustomizeAddressBlockDialog *pParent);
@@ -242,7 +242,7 @@ private:
 
 public:
     SwCustomizeAddressBlockDialog(vcl::Window* pParent, SwMailMergeConfigItem& rConfig, DialogType);
-    virtual ~SwCustomizeAddressBlockDialog();
+    virtual ~SwCustomizeAddressBlockDialog() override;
     virtual void dispose() override;
 
     void            SetAddress(const OUString& rAddress);
@@ -274,7 +274,7 @@ public:
                 SwMailMergeConfigItem& rConfigItem,
                 const OUString& rPreview,
                 bool bIsAddressBlock);
-    virtual ~SwAssignFieldsDialog();
+    virtual ~SwAssignFieldsDialog() override;
     virtual void dispose() override;
 };
 #endif
diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx
index e3380550bc5f..8015506755a2 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hxx
+++ b/sw/source/ui/dbui/mmdocselectpage.hxx
@@ -51,7 +51,7 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage
 
 public:
         SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent);
-        virtual ~SwMailMergeDocSelectPage();
+        virtual ~SwMailMergeDocSelectPage() override;
     virtual void dispose() override;
 
 };
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index f81090a21069..a1fc1909b375 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -99,7 +99,7 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage,
     virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
 public:
         SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent);
-        virtual ~SwMailMergeGreetingsPage();
+        virtual ~SwMailMergeGreetingsPage() override;
     virtual void dispose() override;
 
 };
@@ -115,7 +115,7 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler
     DECL_LINK_TYPED(OKHdl, Button*, void);
 public:
     SwMailBodyDialog(vcl::Window* pParent);
-    virtual ~SwMailBodyDialog();
+    virtual ~SwMailBodyDialog() override;
     virtual void dispose() override;
 
     void            SetBody(const OUString& rBody ) {m_pBodyMLE->SetText(rBody);}
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 3c113d570730..e1c32613e3db 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -84,7 +84,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage
     virtual bool        commitPage(::svt::WizardTypes::CommitPageReason _eReason) override;
 public:
         SwMailMergeLayoutPage( SwMailMergeWizard* _pParent);
-        virtual ~SwMailMergeLayoutPage();
+        virtual ~SwMailMergeLayoutPage() override;
     virtual void            dispose() override;
 
     static SwFrameFormat*        InsertAddressAndGreeting(SwView* pView,
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index ea25930b3b9d..a8bd05335850 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -139,7 +139,7 @@ class SwMailDispatcherListener_Impl : public IMailDispatcherListener
 
 public:
     explicit SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg);
-    virtual ~SwMailDispatcherListener_Impl();
+    virtual ~SwMailDispatcherListener_Impl() override;
 
     virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher) override;
     virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher) override;
@@ -226,7 +226,7 @@ class SwSendWarningBox_Impl : public MessageDialog
     VclPtr<VclMultiLineEdit> m_pDetailED;
 public:
     SwSendWarningBox_Impl(vcl::Window* pParent, const OUString& rDetails);
-    virtual ~SwSendWarningBox_Impl() { disposeOnce(); }
+    virtual ~SwSendWarningBox_Impl() override { disposeOnce(); }
     virtual void dispose() override
     {
         m_pDetailED.clear();
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx
index dc755fe15696..4eb248b0a127 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.hxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.hxx
@@ -39,7 +39,7 @@ class SwMailMergeOutputTypePage : public svt::OWizardPage
 
 public:
     SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent);
-    virtual ~SwMailMergeOutputTypePage();
+    virtual ~SwMailMergeOutputTypePage() override;
     virtual void dispose() override;
 };
 #endif
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 644a4de2b142..492944a3f42c 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -203,7 +203,7 @@ public:
         get(m_pCCED, "cc");
         get(m_pBCCED, "bcc");
     }
-    virtual ~SwCopyToDialog() { disposeOnce(); }
+    virtual ~SwCopyToDialog() override { disposeOnce(); }
     virtual void dispose() override
     {
         m_pCCED.clear();
diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx
index c71aaa44667c..97a2b993f15c 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.hxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.hxx
@@ -49,7 +49,7 @@ class SwSelectDBTableDialog : public SfxModalDialog
 public:
     SwSelectDBTableDialog(vcl::Window* pParent,
         const css::uno::Reference<css::sdbc::XConnection>& xConnection);
-    virtual ~SwSelectDBTableDialog();
+    virtual ~SwSelectDBTableDialog() override;
     virtual void dispose() override;
 
     OUString    GetSelectedTable(bool& bIsTable);
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 6110e98d536c..e6d935912af1 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -352,7 +352,7 @@ public:
     explicit AbstractMailMergeWizard_Impl( SwMailMergeWizard* p )
      : pDlg(p)
      {}
-    virtual         ~AbstractMailMergeWizard_Impl();
+    virtual         ~AbstractMailMergeWizard_Impl() override;
     virtual void    StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override;
     virtual long    GetResult() override;
 
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index e03c3d536c6f..6de321c054c0 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -59,7 +59,7 @@ class SwEnvFormatPage : public SfxTabPage
 
 public:
     SwEnvFormatPage(vcl::Window* pParent, const SfxItemSet& rSet);
-    virtual ~SwEnvFormatPage();
+    virtual ~SwEnvFormatPage() override;
     virtual void dispose() override;
 
     static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index bda4f88a0c34..8dc800de6efb 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -58,7 +58,7 @@ class SwEnvPrtPage : public SfxTabPage
 
 public:
     SwEnvPrtPage(vcl::Window* pParent, const SfxItemSet& rSet);
-    virtual ~SwEnvPrtPage();
+    virtual ~SwEnvPrtPage() override;
     virtual void dispose() override;
 
     static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index c48d0921adfd..44268dce46e5 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -99,7 +99,7 @@ class SwLabFormatPage : public SfxTabPage
 
 public:
     SwLabFormatPage(vcl::Window* pParent, const SfxItemSet& rSet);
-    virtual ~SwLabFormatPage();
+    virtual ~SwLabFormatPage() override;
     virtual void dispose() override;
 
     static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
@@ -128,7 +128,7 @@ class SwSaveLabelDlg : public ModalDialog
 
 public:
     SwSaveLabelDlg(SwLabFormatPage* pParent, SwLabRec& rRec);
-    virtual ~SwSaveLabelDlg();
+    virtual ~SwSaveLabelDlg() override;
     virtual void dispose() override;
 
     void SetLabel(const OUString& rMake, const OUString& rType)
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 9706cd34d57f..2827f7bf92d5 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -53,7 +53,7 @@ class SwLabPrtPage : public SfxTabPage
 
 public:
     SwLabPrtPage(vcl::Window* pParent, const SfxItemSet& rSet);
-    virtual ~SwLabPrtPage();
+    virtual ~SwLabPrtPage() override;
     virtual void dispose() override;
 
     static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 1d2eba8acc37..68f11b1e9347 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -89,7 +89,7 @@ class SwXSelChgLstnr_Impl : public cppu::WeakImplHelper
     SwMailMergeDlg& rParent;
 public:
     explicit SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg);
-    virtual ~SwXSelChgLstnr_Impl();
+    virtual ~SwXSelChgLstnr_Impl() override;
 
     virtual void SAL_CALL selectionChanged( const EventObject& aEvent ) throw (RuntimeException, std::exception) override;
     virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 548411c5827c..b042169fdf60 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -61,7 +61,7 @@ class SwLabPage : public SfxTabPage
 public:
     SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet);
 
-    virtual ~SwLabPage();
+    virtual ~SwLabPage() override;
     virtual void dispose() override;
 
     static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
@@ -107,7 +107,7 @@ class SwVisitingCardPage : public SfxTabPage
                                     const OUString* pNames,
                                     const OUString* pValues );
 
-    virtual ~SwVisitingCardPage();
+    virtual ~SwVisitingCardPage() override;
     virtual void dispose() override;
 
     using TabPage::ActivatePage;
@@ -152,7 +152,7 @@ class SwPrivateDataPage : public SfxTabPage
 
 public:
     SwPrivateDataPage(vcl::Window* pParent, const SfxItemSet& rSet);
-    virtual ~SwPrivateDataPage();
+    virtual ~SwPrivateDataPage() override;
     virtual void dispose() override;
 
     static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
@@ -189,7 +189,7 @@ class SwBusinessDataPage : public SfxTabPage
 
 public:
     SwBusinessDataPage(vcl::Window* pParent, const SfxItemSet& rSet);
-    virtual ~SwBusinessDataPage();
+    virtual ~SwBusinessDataPage() override;
     virtual void dispose() override;
 
     static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index dc635614b022..8e58090b485f 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -71,7 +71,7 @@ protected:
 public:
                         SwFieldDBPage(vcl::Window* pParent, const SfxItemSet* rSet);
 
-                        virtual ~SwFieldDBPage();
+                        virtual ~SwFieldDBPage() override;
     virtual void        dispose() override;
 
     static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index f90394cfe47a..e01057460c16 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -61,7 +61,7 @@ protected:
 public:
                         SwFieldDokInfPage(vcl::Window* pWindow, const SfxItemSet* pSet);
 
-                        virtual ~SwFieldDokInfPage();
+                        virtual ~SwFieldDokInfPage() override;
     virtual void        dispose() override;
 
     static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index 1c3245c4b6e6..cd20b27cc8cb 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -63,7 +63,7 @@ protected:
 public:
                         SwFieldDokPage(vcl::Window* pWindow, const SfxItemSet * pSet);
 
-                        virtual ~SwFieldDokPage();
+                        virtual ~SwFieldDokPage() override;
     virtual void        dispose() override;
 
     static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 8615879317db..b8034a495beb 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -88,7 +88,7 @@ protected:
 public:
                         SwFieldFuncPage(vcl::Window* pParent, const SfxItemSet* pSet);
 
-                        virtual ~SwFieldFuncPage();
+                        virtual ~SwFieldFuncPage() override;
     virtual void        dispose() override;
 
     static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index 92495a45ce9d..b7c5090b9b13 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -80,7 +80,7 @@ public:
     SwFieldPage(vcl::Window *pParent, const OString& rID,
         const OUString& rUIXMLDescription, const SfxItemSet *pAttrSet);
 
-    virtual ~SwFieldPage();
+    virtual ~SwFieldPage() override;
 
     virtual void        ActivatePage() override;
 
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index 7c14810e829d..30f13754e246 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -84,7 +84,7 @@ protected:
 public:
                         SwFieldRefPage(vcl::Window* pParent, const SfxItemSet* pSet);
 
-                        virtual ~SwFieldRefPage();
+                        virtual ~SwFieldRefPage() override;
     virtual void        dispose() override;
 
     static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index f4c402212389..9294da46b626 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -93,7 +93,7 @@ protected:
 public:
                         SwFieldVarPage(vcl::Window* pParent, const SfxItemSet* pSet);
 
-                        virtual ~SwFieldVarPage();
+                        virtual ~SwFieldVarPage() override;
     virtual void        dispose() override;
 
     static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index cc176df7bb43..974cd3d0a91e 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -66,7 +66,7 @@ class SwSequenceOptionDialog : public SvxStandardDialog
 public:
     SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV,
                             const OUString& rSeqFieldType );
-    virtual ~SwSequenceOptionDialog();
+    virtual ~SwSequenceOptionDialog() override;
     virtual void dispose() override;
     virtual void Apply() override;
 
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index 2a7debc0b15b..e70cadc543b7 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -63,7 +63,7 @@ class SwMMResultSaveDialog : public SfxModalDialog
 
 public:
     SwMMResultSaveDialog();
-    virtual ~SwMMResultSaveDialog();
+    virtual ~SwMMResultSaveDialog() override;
 
     virtual void dispose() override;
 };
@@ -95,7 +95,7 @@ class SwMMResultPrintDialog : public SfxModalDialog
 
 public:
     SwMMResultPrintDialog();
-    virtual ~SwMMResultPrintDialog();
+    virtual ~SwMMResultPrintDialog() override;
 
     virtual void dispose() override;
 };
@@ -145,7 +145,7 @@ class SwMMResultEmailDialog : public SfxModalDialog
 
 public:
     SwMMResultEmailDialog();
-    virtual ~SwMMResultEmailDialog();
+    virtual ~SwMMResultEmailDialog() override;
 
     virtual void dispose() override;
 };
@@ -212,7 +212,7 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog
 
 public:
     SwSendMailDialog( vcl::Window* pParent, SwMailMergeConfigItem& );
-    virtual ~SwSendMailDialog();
+    virtual ~SwSendMailDialog() override;
     virtual void        dispose() override;
 
     void                AddDocument( SwMailDescriptor& rDesc );
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index e45134e91e4e..965b66feb641 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -178,7 +178,7 @@ protected:
 
 public:
     SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pBuilder);
-    virtual ~SwEntryBrowseBox();
+    virtual ~SwEntryBrowseBox() override;
     virtual void                    dispose() override;
     void                            ReadEntries(SvStream& rInStr);
     void                            WriteEntries(SvStream& rOutStr);
@@ -204,7 +204,7 @@ class SwAutoMarkDlg_Impl : public ModalDialog
 public:
     SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAutoMarkURL,
                        bool bCreate);
-    virtual ~SwAutoMarkDlg_Impl();
+    virtual ~SwAutoMarkDlg_Impl() override;
     virtual void dispose() override;
 
 };
@@ -643,7 +643,7 @@ class SwAddStylesDlg_Impl : public SfxModalDialog
 
 public:
     SwAddStylesDlg_Impl(vcl::Window* pParent, SwWrtShell& rWrtSh, OUString rStringArr[]);
-    virtual ~SwAddStylesDlg_Impl();
+    virtual ~SwAddStylesDlg_Impl() override;
     virtual void dispose() override;
 };
 
@@ -1538,7 +1538,7 @@ public:
         m_pParent( pTokenWin )
     {
     }
-    virtual ~SwTOXEdit() { disposeOnce(); }
+    virtual ~SwTOXEdit() override { disposeOnce(); }
     virtual void dispose() override { m_pParent.clear(); Edit::dispose(); }
 
     virtual void    KeyInput( const KeyEvent& rKEvt ) override;
@@ -1625,7 +1625,7 @@ public:
         m_pParent(pTokenWin)
     {
     }
-    virtual ~SwTOXButton() { disposeOnce(); }
+    virtual ~SwTOXButton() override { disposeOnce(); }
     virtual void dispose() override { m_pParent.clear(); PushButton::dispose(); }
 
     virtual void KeyInput( const KeyEvent& rKEvt ) override;
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index d86f9e720167..00e07b6ff78d 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -589,7 +589,7 @@ class SwNewUserIdxDlg : public ModalDialog
                 m_pOKPB->Enable(false);
                 m_pNameED->GrabFocus();
             }
-    virtual ~SwNewUserIdxDlg() { disposeOnce(); }
+    virtual ~SwNewUserIdxDlg() override { disposeOnce(); }
     virtual void dispose() override
     {
         m_pOKPB.clear();
@@ -1034,7 +1034,7 @@ public:
                             SwWrtShell& rSh,
                             bool bNewEntry,
                             bool bCreate);
-    virtual ~SwCreateAuthEntryDlg_Impl();
+    virtual ~SwCreateAuthEntryDlg_Impl() override;
     virtual void    dispose() override;
 
     OUString        GetEntryText(ToxAuthorityField eField) const;
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 9deb0fe237fd..e3e7cbd6c6ef 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -132,7 +132,7 @@ public:
     SwNewGlosNameDlg( vcl::Window* pParent,
                       const OUString& rOldName,
                       const OUString& rOldShort );
-    virtual ~SwNewGlosNameDlg();
+    virtual ~SwNewGlosNameDlg() override;
     virtual void dispose() override;
 
     OUString GetNewName()  const { return m_pNewName->GetText(); }
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index da9aef788044..f4c0a2c11a67 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -69,7 +69,7 @@ class SwEndNoteOptionPage : public SfxTabPage
 public:
     SwEndNoteOptionPage( vcl::Window *pParent, bool bEndNote,
                          const SfxItemSet &rSet );
-    virtual ~SwEndNoteOptionPage();
+    virtual ~SwEndNoteOptionPage() override;
     virtual void dispose() override;
 
     static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
@@ -83,7 +83,7 @@ class SwFootNoteOptionPage : public SwEndNoteOptionPage
 {
     friend class VclPtr<SwFootNoteOptionPage>;
     SwFootNoteOptionPage( vcl::Window *pParent, const SfxItemSet &rSet );
-    virtual ~SwFootNoteOptionPage();
+    virtual ~SwFootNoteOptionPage() override;
 
 public:
     static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index c1da74163f2f..25d450d2665f 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -69,7 +69,7 @@ class SwNumNamesDlg : public ModalDialog
 
 public:
     explicit SwNumNamesDlg(vcl::Window *pParent);
-    virtual ~SwNumNamesDlg();
+    virtual ~SwNumNamesDlg() override;
     virtual void dispose() override;
     void SetUserNames(const OUString *pList[]);
     OUString GetName() const { return m_pFormEdit->GetText(); }
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 0c289cf19fea..9d9a2a1ab36a 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -48,7 +48,7 @@ class AutoFormatPreview : public vcl::Window
 {
 public:
     AutoFormatPreview(vcl::Window* pParent, WinBits nStyle);
-    virtual ~AutoFormatPreview();
+    virtual ~AutoFormatPreview() override;
     virtual void dispose() override;
 
     void NotifyChange( const SwTableAutoFormat& rNewData );
@@ -102,7 +102,7 @@ class SwStringInputDlg : public ModalDialog
 public:
     SwStringInputDlg(vcl::Window* pParent, const OUString& rTitle,
                      const OUString& rEditTitle, const OUString& rDefault );
-    virtual ~SwStringInputDlg();
+    virtual ~SwStringInputDlg() override;
     virtual void dispose() override;
 
     OUString GetInputString() const;
diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx
index 5989e8fa2746..aa07c87f10fc 100644
--- a/sw/source/ui/uno/swdetect.hxx
+++ b/sw/source/ui/uno/swdetect.hxx
@@ -54,7 +54,7 @@ class SwFilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFi
 {
 public:
                             SwFilterDetect();
-    virtual                 ~SwFilterDetect();
+    virtual                 ~SwFilterDetect() override;
 
     /* XServiceInfo */
     virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx
index 5823079347d4..6e15132281a4 100644
--- a/sw/source/ui/vba/vbaaddin.hxx
+++ b/sw/source/ui/vba/vbaaddin.hxx
@@ -32,7 +32,7 @@ private:
 
 public:
     SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaAddin();
+    virtual ~SwVbaAddin() override;
 
     // Attributes
     virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbaaddins.hxx b/sw/source/ui/vba/vbaaddins.hxx
index f6a8908ee009..87406b0eb2ca 100644
--- a/sw/source/ui/vba/vbaaddins.hxx
+++ b/sw/source/ui/vba/vbaaddins.hxx
@@ -29,7 +29,7 @@ class SwVbaAddins : public SwVbaAddins_BASE
 {
 public:
     SwVbaAddins( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext ) throw (css::uno::RuntimeException);
-    virtual ~SwVbaAddins() {}
+    virtual ~SwVbaAddins() override {}
 
     // XEnumerationAccess
     virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx
index 16b9b40b0c3f..63b33d125df2 100644
--- a/sw/source/ui/vba/vbaapplication.hxx
+++ b/sw/source/ui/vba/vbaapplication.hxx
@@ -37,7 +37,7 @@ class SwVbaApplication : public SwVbaApplication_BASE
 {
 public:
     explicit SwVbaApplication( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
-    virtual ~SwVbaApplication();
+    virtual ~SwVbaApplication() override;
 
     // XApplication
     virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx
index d7151141c502..8b7a4f268435 100644
--- a/sw/source/ui/vba/vbaautotextentry.hxx
+++ b/sw/source/ui/vba/vbaautotextentry.hxx
@@ -35,7 +35,7 @@ private:
 
 public:
     SwVbaAutoTextEntry( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XAutoTextEntry >& xEntry ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaAutoTextEntry();
+    virtual ~SwVbaAutoTextEntry() override;
 
     // XAutoTextEntry
     virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) throw ( css::uno::RuntimeException, std::exception ) override;
@@ -51,7 +51,7 @@ class SwVbaAutoTextEntries : public SwVbaAutoTextEntries_BASE
 {
 public:
     SwVbaAutoTextEntries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw (css::uno::RuntimeException);
-    virtual ~SwVbaAutoTextEntries() {}
+    virtual ~SwVbaAutoTextEntries() override {}
 
     // XEnumerationAccess
     virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx
index 2b28f7bec190..daee6585232b 100644
--- a/sw/source/ui/vba/vbabookmark.hxx
+++ b/sw/source/ui/vba/vbabookmark.hxx
@@ -40,7 +40,7 @@ private:
 public:
     SwVbaBookmark( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
         const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rName ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaBookmark();
+    virtual ~SwVbaBookmark() override;
 
    // Methods
     virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException, std::exception ) override;
diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx
index abf85dc85617..24df319a7760 100644
--- a/sw/source/ui/vba/vbabookmarks.hxx
+++ b/sw/source/ui/vba/vbabookmarks.hxx
@@ -41,7 +41,7 @@ private:
 
 public:
     SwVbaBookmarks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xBookmarks, const css::uno::Reference< css::frame::XModel >& xModel );
-    virtual ~SwVbaBookmarks() {}
+    virtual ~SwVbaBookmarks() override {}
 
     static void addBookmarkByName( const css::uno::Reference< css::frame::XModel >& xModel, const OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException);
     // XEnumerationAccess
diff --git a/sw/source/ui/vba/vbaborders.hxx b/sw/source/ui/vba/vbaborders.hxx
index b54a6c9e05de..67c4e53b1ba4 100644
--- a/sw/source/ui/vba/vbaborders.hxx
+++ b/sw/source/ui/vba/vbaborders.hxx
@@ -34,7 +34,7 @@ class SwVbaBorders : public SwVbaBorders_BASE
     css::uno::Reference< css::beans::XPropertySet > m_xProps;
 public:
     SwVbaBorders( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::table::XCellRange >& xRange, VbaPalette& rPalette );
-    virtual ~SwVbaBorders() {}
+    virtual ~SwVbaBorders() override {}
 
     // XEnumerationAccess
     virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
diff --git a/sw/source/ui/vba/vbacell.hxx b/sw/source/ui/vba/vbacell.hxx
index 62f667866448..f617df664488 100644
--- a/sw/source/ui/vba/vbacell.hxx
+++ b/sw/source/ui/vba/vbacell.hxx
@@ -34,7 +34,7 @@ private:
 
 public:
     SwVbaCell( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nColumn, sal_Int32 nRow ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaCell();
+    virtual ~SwVbaCell() override;
 
     // Attributes
     virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx
index 62c2e9575a2c..3bb791ce40f6 100644
--- a/sw/source/ui/vba/vbacells.cxx
+++ b/sw/source/ui/vba/vbacells.cxx
@@ -66,7 +66,7 @@ public:
     CellCollectionHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw ( css::uno::RuntimeException ): mxParent( xParent ), mxContext( xContext ), mxTextTable( xTextTable ), mnLeft( nLeft ), mnTop( nTop ), mnRight( nRight ), mnBottom( nBottom )
     {
     }
-    virtual ~CellCollectionHelper() {}
+    virtual ~CellCollectionHelper() override {}
 
     virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
     {
diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx
index b78a7b4e9f22..2626eb8dacca 100644
--- a/sw/source/ui/vba/vbacells.hxx
+++ b/sw/source/ui/vba/vbacells.hxx
@@ -35,7 +35,7 @@ private:
 
 public:
     SwVbaCells( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaCells() {}
+    virtual ~SwVbaCells() override {}
 
     // Attributes
     virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx
index d3c9f2e4122a..ac8d6a7623c6 100644
--- a/sw/source/ui/vba/vbacolumn.hxx
+++ b/sw/source/ui/vba/vbacolumn.hxx
@@ -36,7 +36,7 @@ private:
 
 public:
     SwVbaColumn( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nIndex ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaColumn();
+    virtual ~SwVbaColumn() override;
 
     // Methods
     virtual sal_Int32 SAL_CALL getWidth() throw ( css::uno::RuntimeException, std::exception ) override;
diff --git a/sw/source/ui/vba/vbacolumns.hxx b/sw/source/ui/vba/vbacolumns.hxx
index 60297dc36d6d..e1735f29fead 100644
--- a/sw/source/ui/vba/vbacolumns.hxx
+++ b/sw/source/ui/vba/vbacolumns.hxx
@@ -41,7 +41,7 @@ private:
 public:
     SwVbaColumns( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableColumns >& xTableColumns ) throw ( css::uno::RuntimeException );
     SwVbaColumns( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaColumns() {}
+    virtual ~SwVbaColumns() override {}
 
     virtual sal_Int32 SAL_CALL getWidth(  ) throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbadialog.hxx b/sw/source/ui/vba/vbadialog.hxx
index b142e0799bcd..e4021aaeaf8b 100644
--- a/sw/source/ui/vba/vbadialog.hxx
+++ b/sw/source/ui/vba/vbadialog.hxx
@@ -30,7 +30,7 @@ class SwVbaDialog : public SwVbaDialog_BASE
 {
 public:
     SwVbaDialog( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nIndex ):SwVbaDialog_BASE( xParent, xContext, xModel, nIndex ) {}
-    virtual ~SwVbaDialog() {}
+    virtual ~SwVbaDialog() override {}
 
     // Methods
     virtual OUString mapIndexToName( sal_Int32 nIndex ) override;
diff --git a/sw/source/ui/vba/vbadialogs.hxx b/sw/source/ui/vba/vbadialogs.hxx
index 1649bd0b9b90..069abbbf5dae 100644
--- a/sw/source/ui/vba/vbadialogs.hxx
+++ b/sw/source/ui/vba/vbadialogs.hxx
@@ -32,7 +32,7 @@ class SwVbaDialogs : public SwVbaDialogs_BASE
 {
 public:
     SwVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): SwVbaDialogs_BASE( xParent, xContext, xModel ) {}
-    virtual ~SwVbaDialogs() {}
+    virtual ~SwVbaDialogs() override {}
 
     // XCollection
     virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx
index 85c8e6394729..da7e419a0829 100644
--- a/sw/source/ui/vba/vbadocument.hxx
+++ b/sw/source/ui/vba/vbadocument.hxx
@@ -39,7 +39,7 @@ private:
 public:
     SwVbaDocument( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& m_xContext, css::uno::Reference< css::frame::XModel > const & xModel );
     SwVbaDocument(  css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
-    virtual ~SwVbaDocument();
+    virtual ~SwVbaDocument() override;
 
     // XDocument
     virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getContent() throw ( css::uno::RuntimeException, std::exception ) override;
diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx
index a74fd03b2ccd..05a8c207cef5 100644
--- a/sw/source/ui/vba/vbadocuments.hxx
+++ b/sw/source/ui/vba/vbadocuments.hxx
@@ -32,7 +32,7 @@ class SwVbaDocuments : public SwVbaDocuments_BASE
 {
 public:
     SwVbaDocuments( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext );
-    virtual ~SwVbaDocuments() {}
+    virtual ~SwVbaDocuments() override {}
 
     // XEnumerationAccess
     virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
diff --git a/sw/source/ui/vba/vbaeventshelper.hxx b/sw/source/ui/vba/vbaeventshelper.hxx
index 7b946a68ac43..a366ee19452a 100644
--- a/sw/source/ui/vba/vbaeventshelper.hxx
+++ b/sw/source/ui/vba/vbaeventshelper.hxx
@@ -28,7 +28,7 @@ public:
     SwVbaEventsHelper(
         const css::uno::Sequence< css::uno::Any >& rArgs,
         const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual ~SwVbaEventsHelper();
+    virtual ~SwVbaEventsHelper() override;
 
 protected:
     virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException) override;
diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx
index 54ec7a46af2d..d605a8a81692 100644
--- a/sw/source/ui/vba/vbafind.hxx
+++ b/sw/source/ui/vba/vbafind.hxx
@@ -54,7 +54,7 @@ private:
 
 public:
     SwVbaFind( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaFind();
+    virtual ~SwVbaFind() override;
 
     // Attributes
     virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbafont.hxx b/sw/source/ui/vba/vbafont.hxx
index 1759800c0ae7..aedb392af125 100644
--- a/sw/source/ui/vba/vbafont.hxx
+++ b/sw/source/ui/vba/vbafont.hxx
@@ -30,7 +30,7 @@ class SwVbaFont : public SwVbaFont_BASE
 {
 public:
     SwVbaFont( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPalette, css::uno::Reference< css::beans::XPropertySet > const & xPropertySet ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaFont(){}
+    virtual ~SwVbaFont() override {}
 
     // Attributes
     virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbaframe.hxx b/sw/source/ui/vba/vbaframe.hxx
index 2e7a2603fc78..166fe7fd13e7 100644
--- a/sw/source/ui/vba/vbaframe.hxx
+++ b/sw/source/ui/vba/vbaframe.hxx
@@ -33,7 +33,7 @@ private:
 
 public:
     SwVbaFrame( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const css::uno::Reference< css::text::XTextFrame >& xTextFrame ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaFrame();
+    virtual ~SwVbaFrame() override;
 
    // Methods
     virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ) override;
diff --git a/sw/source/ui/vba/vbaframes.hxx b/sw/source/ui/vba/vbaframes.hxx
index 950e0b437d93..e1887f80030a 100644
--- a/sw/source/ui/vba/vbaframes.hxx
+++ b/sw/source/ui/vba/vbaframes.hxx
@@ -34,7 +34,7 @@ private:
 
 public:
     SwVbaFrames( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xFrames, const css::uno::Reference< css::frame::XModel >& xModel );
-    virtual ~SwVbaFrames() {}
+    virtual ~SwVbaFrames() override {}
 
     // XEnumerationAccess
     virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx
index e473f83956f0..f45f43de8c19 100644
--- a/sw/source/ui/vba/vbaglobals.hxx
+++ b/sw/source/ui/vba/vbaglobals.hxx
@@ -43,7 +43,7 @@ private:
 public:
 
     SwVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& rxContext );
-    virtual ~SwVbaGlobals();
+    virtual ~SwVbaGlobals() override;
 
     // XGlobals
     virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx
index 29e28a97dda1..ba10bfbb8812 100644
--- a/sw/source/ui/vba/vbaheaderfooter.hxx
+++ b/sw/source/ui/vba/vbaheaderfooter.hxx
@@ -35,7 +35,7 @@ private:
 
 public:
     SwVbaHeaderFooter( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader, sal_Int32 index ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaHeaderFooter(){}
+    virtual ~SwVbaHeaderFooter() override {}
 
     // Attributes
     virtual sal_Bool SAL_CALL getIsHeader() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx
index 8c585df288c7..40892d3542e7 100644
--- a/sw/source/ui/vba/vbaheadersfooters.cxx
+++ b/sw/source/ui/vba/vbaheadersfooters.cxx
@@ -36,7 +36,7 @@ private:
 
 public:
     HeadersFootersIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xPageStyleProps, bool bHeader ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxPageStyleProps( xPageStyleProps ), mbHeader( bHeader ) {}
-    virtual ~HeadersFootersIndexAccess(){}
+    virtual ~HeadersFootersIndexAccess() override {}
 
     // XIndexAccess
     virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx
index 32d839b9264d..9137721ec26d 100644
--- a/sw/source/ui/vba/vbaheadersfooters.hxx
+++ b/sw/source/ui/vba/vbaheadersfooters.hxx
@@ -34,7 +34,7 @@ private:
 
 public:
     SwVbaHeadersFooters( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader );
-    virtual ~SwVbaHeadersFooters() {}
+    virtual ~SwVbaHeadersFooters() override {}
 
     virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override;
     virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override;
diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx
index 5d07d5ff87ee..d9c3e9a283eb 100644
--- a/sw/source/ui/vba/vbalistformat.hxx
+++ b/sw/source/ui/vba/vbalistformat.hxx
@@ -34,7 +34,7 @@ private:
 
 public:
     SwVbaListFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaListFormat();
+    virtual ~SwVbaListFormat() override;
 
     // Methods
     virtual void SAL_CALL ApplyListTemplate( const css::uno::Reference< ::ooo::vba::word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbalistgalleries.hxx b/sw/source/ui/vba/vbalistgalleries.hxx
index 5880b9f0db3e..c82c56fdf40b 100644
--- a/sw/source/ui/vba/vbalistgalleries.hxx
+++ b/sw/source/ui/vba/vbalistgalleries.hxx
@@ -33,7 +33,7 @@ private:
 
 public:
     SwVbaListGalleries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc ) throw (css::uno::RuntimeException);
-    virtual ~SwVbaListGalleries() {}
+    virtual ~SwVbaListGalleries() override {}
 
     virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override;
     virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) override;
diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx
index 8a04fe1fdd06..2c9df465a1aa 100644
--- a/sw/source/ui/vba/vbalistgallery.hxx
+++ b/sw/source/ui/vba/vbalistgallery.hxx
@@ -33,7 +33,7 @@ private:
 
 public:
     SwVbaListGallery( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nType ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaListGallery();
+    virtual ~SwVbaListGallery() override;
 
     // Methods
     virtual css::uno::Any SAL_CALL ListTemplates( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ) override;
diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx
index d2c4aac15746..369debc64c43 100644
--- a/sw/source/ui/vba/vbalistlevel.hxx
+++ b/sw/source/ui/vba/vbalistlevel.hxx
@@ -34,7 +34,7 @@ private:
 
 public:
     SwVbaListLevel( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, SwVbaListHelperRef const & pHelper, sal_Int32 nLevel ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaListLevel();
+    virtual ~SwVbaListLevel() override;
 
     // Attributes
     virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx
index c13a17dbe6d7..98eeab0b48c2 100644
--- a/sw/source/ui/vba/vbalistlevels.hxx
+++ b/sw/source/ui/vba/vbalistlevels.hxx
@@ -33,7 +33,7 @@ private:
 
 public:
     SwVbaListLevels( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, SwVbaListHelperRef const & pHelper ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaListLevels() {}
+    virtual ~SwVbaListLevels() override {}
 
     virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override;
     virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) override;
diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx
index de1744068283..59234fff56c3 100644
--- a/sw/source/ui/vba/vbalisttemplate.hxx
+++ b/sw/source/ui/vba/vbalisttemplate.hxx
@@ -33,7 +33,7 @@ private:
 
 public:
     SwVbaListTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaListTemplate();
+    virtual ~SwVbaListTemplate() override;
 
     void applyListTemplate( css::uno::Reference< css::beans::XPropertySet >& xProps ) throw ( css::uno::RuntimeException );
 
diff --git a/sw/source/ui/vba/vbalisttemplates.hxx b/sw/source/ui/vba/vbalisttemplates.hxx
index fcea9c4a158f..6bcc6a59b226 100644
--- a/sw/source/ui/vba/vbalisttemplates.hxx
+++ b/sw/source/ui/vba/vbalisttemplates.hxx
@@ -34,7 +34,7 @@ private:
 
 public:
     SwVbaListTemplates( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nType ) throw (css::uno::RuntimeException);
-    virtual ~SwVbaListTemplates() {}
+    virtual ~SwVbaListTemplates() override {}
 
     virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override;
     virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) override;
diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx
index c3124b5eea4a..9a15ccd8a759 100644
--- a/sw/source/ui/vba/vbaoptions.hxx
+++ b/sw/source/ui/vba/vbaoptions.hxx
@@ -33,7 +33,7 @@ private:
     OUString msDefaultFilePath;
 public:
     explicit SwVbaOptions( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
-    virtual ~SwVbaOptions();
+    virtual ~SwVbaOptions() override;
 
     // Attributes
     virtual ::sal_Int32 SAL_CALL getDefaultBorderLineStyle() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbapagesetup.hxx b/sw/source/ui/vba/vbapagesetup.hxx
index 13889ff663dd..f921464cf472 100644
--- a/sw/source/ui/vba/vbapagesetup.hxx
+++ b/sw/source/ui/vba/vbapagesetup.hxx
@@ -38,7 +38,7 @@ public:
                     const css::uno::Reference< css::uno::XComponentContext >& xContext,
                     const css::uno::Reference< css::frame::XModel >& xModel,
                     const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw (css::uno::RuntimeException);
-    virtual ~SwVbaPageSetup(){}
+    virtual ~SwVbaPageSetup() override {}
 
     // Attributes
     virtual double SAL_CALL getGutter() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbapane.hxx b/sw/source/ui/vba/vbapane.hxx
index 1c14443b69f2..d0bf4e16d056 100644
--- a/sw/source/ui/vba/vbapane.hxx
+++ b/sw/source/ui/vba/vbapane.hxx
@@ -32,7 +32,7 @@ private:
 public:
     SwVbaPane( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
         const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaPane();
+    virtual ~SwVbaPane() override;
 
     // Methods
     virtual css::uno::Any SAL_CALL View(  ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx
index a21b4c6c0baa..75108ffb6f0f 100644
--- a/sw/source/ui/vba/vbapanes.cxx
+++ b/sw/source/ui/vba/vbapanes.cxx
@@ -33,7 +33,7 @@ private:
 
 public:
     PanesIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ) {}
-    virtual ~PanesIndexAccess(){}
+    virtual ~PanesIndexAccess() override {}
 
     // XIndexAccess
     virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
diff --git a/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx
index bbdc9bd944c5..489c6a2f90ed 100644
--- a/sw/source/ui/vba/vbapanes.hxx
+++ b/sw/source/ui/vba/vbapanes.hxx
@@ -31,7 +31,7 @@ class SwVbaPanes : public SwVbaPanes_BASE
 {
 public:
     SwVbaPanes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel );
-    virtual ~SwVbaPanes() {}
+    virtual ~SwVbaPanes() override {}
 
     // XEnumerationAccess
     virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx
index 224c8e4dd081..7ab48f95b355 100644
--- a/sw/source/ui/vba/vbaparagraph.hxx
+++ b/sw/source/ui/vba/vbaparagraph.hxx
@@ -36,7 +36,7 @@ private:
 
 public:
     SwVbaParagraph( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xDocument, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaParagraph();
+    virtual ~SwVbaParagraph() override;
 
     // XParagraph
     virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw ( css::uno::RuntimeException, std::exception ) override;
@@ -56,7 +56,7 @@ private:
     css::uno::Reference< css::text::XTextDocument > mxTextDocument;
 public:
     SwVbaParagraphs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xDocument ) throw (css::uno::RuntimeException);
-    virtual ~SwVbaParagraphs() {}
+    virtual ~SwVbaParagraphs() override {}
 
     // XEnumerationAccess
     virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx
index f0d4c54ea6cc..656bc6bad536 100644
--- a/sw/source/ui/vba/vbaparagraphformat.hxx
+++ b/sw/source/ui/vba/vbaparagraphformat.hxx
@@ -42,7 +42,7 @@ private:
 
 public:
     SwVbaParagraphFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::beans::XPropertySet >& rParaProps );
-    virtual ~SwVbaParagraphFormat();
+    virtual ~SwVbaParagraphFormat() override;
 
     // Attributes
     virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception) override;
diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx
index c9e096660a6b..8d29f7a9570d 100644
--- a/sw/source/ui/vba/vbarange.hxx
+++ b/sw/source/ui/vba/vbarange.hxx
@@ -45,7 +45,7 @@ public:
     SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart) throw (css::script::BasicErrorException, css::uno::RuntimeException);
     SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
     SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-    virtual ~SwVbaRange();
+    virtual ~SwVbaRange() override;
     const css::uno::Reference< css::text::XTextDocument >& getDocument() const { return mxTextDocument; }
 
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbareplacement.hxx b/sw/source/ui/vba/vbareplacement.hxx
index f4b278c1fe2d..ebe338e3a70d 100644
--- a/sw/source/ui/vba/vbareplacement.hxx
+++ b/sw/source/ui/vba/vbareplacement.hxx
@@ -32,7 +32,7 @@ private:
 
 public:
     SwVbaReplacement( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::util::XPropertyReplace >& xPropertyReplace ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaReplacement();
+    virtual ~SwVbaReplacement() override;
 
     // Attributes
     virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbarevision.hxx b/sw/source/ui/vba/vbarevision.hxx
index 56fb3d5ad34b..841f5bd018f4 100644
--- a/sw/source/ui/vba/vbarevision.hxx
+++ b/sw/source/ui/vba/vbarevision.hxx
@@ -35,7 +35,7 @@ private:
 
 public:
     SwVbaRevision( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xRedlineProps ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaRevision();
+    virtual ~SwVbaRevision() override;
 
     // Methods
     virtual void SAL_CALL Accept(  ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx
index 51f4b4a9a0d7..3b259d19efcc 100644
--- a/sw/source/ui/vba/vbarevisions.hxx
+++ b/sw/source/ui/vba/vbarevisions.hxx
@@ -35,7 +35,7 @@ public:
     SwVbaRevisions( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange );
 
     SwVbaRevisions( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess );
-    virtual ~SwVbaRevisions() {}
+    virtual ~SwVbaRevisions() override {}
 
     // Methods
     virtual void SAL_CALL AcceptAll(  ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbarow.hxx b/sw/source/ui/vba/vbarow.hxx
index 23a2b43cb8a4..94463add6636 100644
--- a/sw/source/ui/vba/vbarow.hxx
+++ b/sw/source/ui/vba/vbarow.hxx
@@ -36,7 +36,7 @@ private:
 
 public:
     SwVbaRow( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nIndex ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaRow();
+    virtual ~SwVbaRow() override;
 
     // Attributes
     virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbarows.hxx b/sw/source/ui/vba/vbarows.hxx
index e59760e70688..eb91dc01dba7 100644
--- a/sw/source/ui/vba/vbarows.hxx
+++ b/sw/source/ui/vba/vbarows.hxx
@@ -45,7 +45,7 @@ private:
 public:
     SwVbaRows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableRows >& xTableRows ) throw ( css::uno::RuntimeException );
     SwVbaRows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableRows >& xTableRows, sal_Int32 nStarIndex, sal_Int32 nEndIndex ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaRows() {}
+    virtual ~SwVbaRows() override {}
 
     // Attributes
     virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbasection.hxx b/sw/source/ui/vba/vbasection.hxx
index 34fe69998fb2..3d5b5f4451c8 100644
--- a/sw/source/ui/vba/vbasection.hxx
+++ b/sw/source/ui/vba/vbasection.hxx
@@ -32,7 +32,7 @@ private:
 
 public:
     SwVbaSection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaSection();
+    virtual ~SwVbaSection() override;
 
     // Attributes
     virtual sal_Bool SAL_CALL getProtectedForForms() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx
index e6c272c4f87c..3b611ae525f6 100644
--- a/sw/source/ui/vba/vbasections.cxx
+++ b/sw/source/ui/vba/vbasections.cxx
@@ -88,7 +88,7 @@ public:
         mxSections.push_back( xPageProps );
     }
 
-    virtual ~SectionCollectionHelper(){}
+    virtual ~SectionCollectionHelper() override {}
 
     // XIndexAccess
     virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
diff --git a/sw/source/ui/vba/vbasections.hxx b/sw/source/ui/vba/vbasections.hxx
index a952c96493d6..b2da9a8daade 100644
--- a/sw/source/ui/vba/vbasections.hxx
+++ b/sw/source/ui/vba/vbasections.hxx
@@ -36,7 +36,7 @@ private:
 public:
     SwVbaSections( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel );
     SwVbaSections( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange );
-    virtual ~SwVbaSections() {}
+    virtual ~SwVbaSections() override {}
 
     // XEnumerationAccess
     virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx
index ef79f134ba60..5643c65e8879 100644
--- a/sw/source/ui/vba/vbaselection.hxx
+++ b/sw/source/ui/vba/vbaselection.hxx
@@ -51,7 +51,7 @@ private:
 
 public:
     SwVbaSelection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaSelection();
+    virtual ~SwVbaSelection() override;
 
     // Attribute
     virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx
index 6fd5615f7fdc..1e7c974ae4c2 100644
--- a/sw/source/ui/vba/vbastyle.hxx
+++ b/sw/source/ui/vba/vbastyle.hxx
@@ -37,7 +37,7 @@ private:
     css::uno::Reference< css::style::XStyle > mxStyle;
 public:
     SwVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::script::BasicErrorException, css::uno::RuntimeException );
-    virtual ~SwVbaStyle(){}
+    virtual ~SwVbaStyle() override {}
 
     static void setStyle( const css::uno::Reference< css::beans::XPropertySet >& xParaProps, const css::uno::Any& xStyle ) throw (css::uno::RuntimeException);
     static sal_Int32 getLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps ) throw (css::uno::RuntimeException, std::exception);
diff --git a/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx
index 23f83b1cbd5e..ae41b838cbdf 100644
--- a/sw/source/ui/vba/vbasystem.hxx
+++ b/sw/source/ui/vba/vbasystem.hxx
@@ -48,7 +48,7 @@ private:
 
 public:
     explicit SwVbaSystem( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
-    virtual ~SwVbaSystem();
+    virtual ~SwVbaSystem() override;
 
     // XSystem
     virtual sal_Int32 SAL_CALL getCursor() throw ( css::uno::RuntimeException, std::exception ) override;
diff --git a/sw/source/ui/vba/vbatableofcontents.hxx b/sw/source/ui/vba/vbatableofcontents.hxx
index 0c1e7af19ee9..fb62dcc0a8f8 100644
--- a/sw/source/ui/vba/vbatableofcontents.hxx
+++ b/sw/source/ui/vba/vbatableofcontents.hxx
@@ -35,7 +35,7 @@ private:
 
 public:
     SwVbaTableOfContents( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xDoc, const css::uno::Reference< css::text::XDocumentIndex >& xDocumentIndex ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaTableOfContents();
+    virtual ~SwVbaTableOfContents() override;
 
     // Attributes
     virtual ::sal_Int32 SAL_CALL getLowerHeadingLevel() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx
index dd716ae9e0ed..37deccecba6f 100644
--- a/sw/source/ui/vba/vbatablesofcontents.cxx
+++ b/sw/source/ui/vba/vbatablesofcontents.cxx
@@ -75,7 +75,7 @@ public:
         }
     }
 
-    virtual ~TableOfContentsCollectionHelper() {}
+    virtual ~TableOfContentsCollectionHelper() override {}
 
     virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
     {
diff --git a/sw/source/ui/vba/vbatablesofcontents.hxx b/sw/source/ui/vba/vbatablesofcontents.hxx
index cc0de8ae240e..30d19c2a5dda 100644
--- a/sw/source/ui/vba/vbatablesofcontents.hxx
+++ b/sw/source/ui/vba/vbatablesofcontents.hxx
@@ -35,7 +35,7 @@ private:
 
 public:
     SwVbaTablesOfContents( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xDoc ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaTablesOfContents() {}
+    virtual ~SwVbaTablesOfContents() override {}
 
     // Methods
     virtual css::uno::Reference< ::ooo::vba::word::XTableOfContents > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& UseHeadingStyles, const css::uno::Any& UpperHeadingLevel, const css::uno::Any& LowerHeadingLevel, const css::uno::Any& UseFields, const css::uno::Any& TableID, const css::uno::Any& RightAlignPageNumbers, const css::uno::Any& IncludePageNumbers, const css::uno::Any& AddedStyles, const css::uno::Any& UseHyperlinks, const css::uno::Any& HidePageNumbersInWeb, const css::uno::Any& UseOutlineLevels ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx
index aaad749f91b2..a28cd6d10f8c 100644
--- a/sw/source/ui/vba/vbatabstop.hxx
+++ b/sw/source/ui/vba/vbatabstop.hxx
@@ -28,7 +28,7 @@ class SwVbaTabStop : public SwVbaTabStop_BASE
 {
 public:
     SwVbaTabStop( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaTabStop();
+    virtual ~SwVbaTabStop() override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx
index dbf1f4e2caea..d9514d16ab71 100644
--- a/sw/source/ui/vba/vbatabstops.cxx
+++ b/sw/source/ui/vba/vbatabstops.cxx
@@ -79,7 +79,7 @@ public:
         mnTabStops = lcl_getTabStops( xParaProps ).getLength();
     }
 
-    virtual ~TabStopCollectionHelper() {}
+    virtual ~TabStopCollectionHelper() override {}
 
     virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
     {
diff --git a/sw/source/ui/vba/vbatabstops.hxx b/sw/source/ui/vba/vbatabstops.hxx
index 9ae33daf20ec..7ec75b529b49 100644
--- a/sw/source/ui/vba/vbatabstops.hxx
+++ b/sw/source/ui/vba/vbatabstops.hxx
@@ -35,7 +35,7 @@ private:
 
 public:
     SwVbaTabStops( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& xParaProps ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaTabStops() {}
+    virtual ~SwVbaTabStops() override {}
 
     // Methods
     virtual css::uno::Reference< ::ooo::vba::word::XTabStop > SAL_CALL Add( float Position, const css::uno::Any& Alignment, const css::uno::Any& Leader )
diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx
index e2b7fc0b9a39..ae6eb822a65e 100644
--- a/sw/source/ui/vba/vbatemplate.hxx
+++ b/sw/source/ui/vba/vbatemplate.hxx
@@ -31,7 +31,7 @@ private:
 public:
     SwVbaTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
         const OUString& );
-    virtual ~SwVbaTemplate();
+    virtual ~SwVbaTemplate() override;
 
    // XTemplate
     virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx
index 19b4db10653e..8f24179671da 100644
--- a/sw/source/ui/vba/vbavariable.hxx
+++ b/sw/source/ui/vba/vbavariable.hxx
@@ -34,7 +34,7 @@ private:
 public:
     SwVbaVariable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
         const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const OUString& rName ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaVariable();
+    virtual ~SwVbaVariable() override;
 
    // XVariable
     virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException, std::exception ) override;
diff --git a/sw/source/ui/vba/vbavariables.hxx b/sw/source/ui/vba/vbavariables.hxx
index d17c505933d9..27fdf3c0c590 100644
--- a/sw/source/ui/vba/vbavariables.hxx
+++ b/sw/source/ui/vba/vbavariables.hxx
@@ -35,7 +35,7 @@ private:
 
 public:
     SwVbaVariables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined );
-    virtual ~SwVbaVariables() {}
+    virtual ~SwVbaVariables() override {}
 
     // XEnumerationAccess
     virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx
index 3e19ca026754..5c6ee55ef49d 100644
--- a/sw/source/ui/vba/vbaview.hxx
+++ b/sw/source/ui/vba/vbaview.hxx
@@ -40,7 +40,7 @@ private:
 public:
     SwVbaView( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
         const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException );
-    virtual ~SwVbaView();
+    virtual ~SwVbaView() override;
 
    // XView
     virtual ::sal_Int32 SAL_CALL getSeekView() throw (css::uno::RuntimeException, std::exception) override;