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

46 files changed, 51 insertions, 51 deletions

diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index 634d1a105779..6bb7d6ef9e15 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -70,7 +70,7 @@ public:
             const css::uno::Reference< css::uno::XComponentContext >& xContext,
             const css::uno::Sequence< css::uno::Any >& lArguments);
 
-    virtual ~DocumentAcceleratorConfiguration();
+    virtual ~DocumentAcceleratorConfiguration() override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index eb7ddedb34b7..318326e98ee7 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -55,7 +55,7 @@ public:
     explicit GlobalAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
     /** TODO */
-    virtual ~GlobalAcceleratorConfiguration() {}
+    virtual ~GlobalAcceleratorConfiguration() override {}
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index fb1b86eb6664..30745d883e67 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -69,7 +69,7 @@ public:
             const css::uno::Sequence< css::uno::Any >& lArguments);
 
     /** TODO */
-    virtual ~ModuleAcceleratorConfiguration();
+    virtual ~ModuleAcceleratorConfiguration() override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 1e5e38520ab6..08db9b86ed03 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -165,7 +165,7 @@ class AddonsOptions_Impl : public ConfigItem
         //  constructor / destructor
 
          AddonsOptions_Impl();
-        virtual ~AddonsOptions_Impl();
+        virtual ~AddonsOptions_Impl() override;
 
         //  overridden methods of baseclass
 
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index 19c55755d54a..7efb8bfce4c4 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -66,7 +66,7 @@ namespace framework
         explicit            UndoActionWrapper(
                                 Reference< XUndoAction > const& i_undoAction
                             );
-        virtual             ~UndoActionWrapper();
+        virtual             ~UndoActionWrapper() override;
 
         virtual OUString    GetComment() const override;
         virtual void        Undo() override;
@@ -170,7 +170,7 @@ namespace framework
         }
 
     protected:
-        virtual ~UndoManagerRequest()
+        virtual ~UndoManagerRequest() override
         {
         }
 
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index e0d875590305..ca2bae697177 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -91,7 +91,7 @@ class XMLBasedAcceleratorConfiguration : public    ::cppu::WeakImplHelper<
     public:
 
         XMLBasedAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext);
-        virtual ~XMLBasedAcceleratorConfiguration(                                                                    );
+        virtual ~XMLBasedAcceleratorConfiguration(                                                                    ) override;
 
         // uno interface!
 
@@ -260,7 +260,7 @@ class XCUBasedAcceleratorConfiguration : public  ::cppu::WeakImplHelper<
     public:
 
         XCUBasedAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext );
-        virtual ~XCUBasedAcceleratorConfiguration(                                                           );
+        virtual ~XCUBasedAcceleratorConfiguration(                                                           ) override;
 
         // uno interface!
 
diff --git a/framework/source/inc/dispatch/dispatchdisabler.hxx b/framework/source/inc/dispatch/dispatchdisabler.hxx
index 046bbb1d4972..7948ff856471 100644
--- a/framework/source/inc/dispatch/dispatchdisabler.hxx
+++ b/framework/source/inc/dispatch/dispatchdisabler.hxx
@@ -46,7 +46,7 @@ class DispatchDisabler : public ::cppu::WeakImplHelper<
     css::uno::Reference< css::frame::XDispatchProvider > mxMaster;
 public:
              DispatchDisabler(const css::uno::Reference< css::uno::XComponentContext >& rxContext);
-    virtual ~DispatchDisabler() {}
+    virtual ~DispatchDisabler() override {}
 
     // XInitialization
     virtual void SAL_CALL initialize( const ::css::uno::Sequence< ::css::uno::Any >& aArguments )
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index 8321bec19053..9d49e46b711a 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -89,7 +89,7 @@ class LoadDispatcher : public  ::cppu::WeakImplHelper< css::frame::XNotifyingDis
 
         /** @short  used to free internal resources.
          */
-        virtual ~LoadDispatcher();
+        virtual ~LoadDispatcher() override;
 
     // uno interface
 
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index d85fb0e34566..e11c8228b6f8 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -77,7 +77,7 @@ private:
 public:
 
     explicit JobDispatch(const css::uno::Reference< css::uno::XComponentContext >& xContext);
-    virtual ~JobDispatch();
+    virtual ~JobDispatch() override;
 
     void impl_dispatchEvent  ( const OUString&                                            sEvent    ,
                                const css::uno::Sequence< css::beans::PropertyValue >&            lArgs     ,
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index eaff5b5efa0a..9912dafc0f9d 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -84,7 +84,7 @@ private:
 public:
 
     explicit JobExecutor(const css::uno::Reference< css::uno::XComponentContext >& xContext);
-    virtual ~JobExecutor();
+    virtual ~JobExecutor() override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 2f0beb0a7fe7..200ef47635d7 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -74,7 +74,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW
         ToolbarLayoutManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                               const css::uno::Reference< css::ui::XUIElementFactory >& xUIElementFactory,
                               LayoutManager* pParentLayouter );
-        virtual ~ToolbarLayoutManager();
+        virtual ~ToolbarLayoutManager() override;
 
         void reset();
         void attach( const css::uno::Reference< css::frame::XFrame >& xFrame,
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
index 9ea52275db80..1f666691c91f 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -53,7 +53,7 @@ class ContextChangeEventMultiplexer
 {
 public:
     ContextChangeEventMultiplexer();
-    virtual ~ContextChangeEventMultiplexer();
+    virtual ~ContextChangeEventMultiplexer() override;
     ContextChangeEventMultiplexer(const ContextChangeEventMultiplexer&) = delete;
     ContextChangeEventMultiplexer& operator=(const ContextChangeEventMultiplexer&) = delete;
 
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 5a9e4e626bcd..76033d84bf96 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -436,7 +436,7 @@ private:
 public:
 
     explicit AutoRecovery(const css::uno::Reference< css::uno::XComponentContext >& xContext);
-    virtual ~AutoRecovery(                                                                   );
+    virtual ~AutoRecovery(                                                                   ) override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 250170b40d0f..5cb7b4bf6460 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -61,7 +61,7 @@ public:
 
     explicit ModuleManager(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
-    virtual ~ModuleManager();
+    virtual ~ModuleManager() override;
 
     ModuleManager(const ModuleManager&) = delete;
     ModuleManager& operator=(const ModuleManager&) = delete;
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 5b22b36b8aab..64963abf1945 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -183,7 +183,7 @@ public:
     explicit PathSettings(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
     /** free all used resources ... if it was not already done. */
-    virtual ~PathSettings();
+    virtual ~PathSettings() override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index befbfc4ff6f7..28feccbf107d 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -108,7 +108,7 @@ private:
 public:
     explicit SessionListener(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
-    virtual ~SessionListener();
+    virtual ~SessionListener() override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index b46cb213821f..5130ae39a8e9 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -114,7 +114,7 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem
 {
     public:
         SubstitutePathVariables_Impl();
-        virtual ~SubstitutePathVariables_Impl();
+        virtual ~SubstitutePathVariables_Impl() override;
 
         static OperatingSystem GetOperatingSystemFromString( const OUString& );
         static EnvironmentType GetEnvTypeFromString( const OUString& );
@@ -229,7 +229,7 @@ friend class SubstitutePathVariables_Impl;
 
 public:
     explicit SubstitutePathVariables(const css::uno::Reference< css::uno::XComponentContext >& xContext);
-    virtual ~SubstitutePathVariables();
+    virtual ~SubstitutePathVariables() override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index 6f73c4df7942..265b30e773dc 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -64,7 +64,7 @@ private:
 public:
 
     explicit TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext);
-    virtual ~TaskCreatorService(                                                                   );
+    virtual ~TaskCreatorService(                                                                   ) override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index e3075df9262d..d5811e4b868a 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -37,7 +37,7 @@ class URLTransformer : public ::cppu::WeakImplHelper< css::util::XURLTransformer
 public:
     URLTransformer() {}
 
-    virtual ~URLTransformer() {}
+    virtual ~URLTransformer() override {}
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index 51e319287e53..aa8a15af8a09 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -57,7 +57,7 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper<
 {
     public:
         explicit GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-        virtual ~GlobalSettings_Access();
+        virtual ~GlobalSettings_Access() override;
 
         // XComponent
         virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index b1310f56c236..1d5022b868ff 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -77,7 +77,7 @@ namespace framework
     {
         public:
             explicit GlobalImageList(const css::uno::Reference< css::uno::XComponentContext >& rxContext);
-            virtual ~GlobalImageList();
+            virtual ~GlobalImageList() override;
 
             virtual Image                           getImageFromCommandURL( vcl::ImageType nImageType, const OUString& rCommandURL ) override;
             virtual bool                            hasImage( vcl::ImageType nImageType, const OUString& rCommandURL ) override;
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 2c707dc18325..f53b3584678e 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -63,7 +63,7 @@ class ModuleUIConfigurationManagerSupplier : private cppu::BaseMutex,
 {
 public:
     explicit ModuleUIConfigurationManagerSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual ~ModuleUIConfigurationManagerSupplier();
+    virtual ~ModuleUIConfigurationManagerSupplier() override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 5f79341edd2c..104b485570a0 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -78,7 +78,7 @@ public:
             const css::uno::Reference< css::uno::XComponentContext >& xServiceManager,
             const css::uno::Sequence< css::uno::Any >& aArguments);
 
-    virtual ~ModuleUIConfigurationManager();
+    virtual ~ModuleUIConfigurationManager() override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index d82c24224ea6..a7319de194f0 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -61,7 +61,7 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper<XNameAccess
     osl::Mutex aMutex;
     public:
                                   ConfigurationAccess_UICategory( const OUString& aModuleName, const Reference< XNameAccess >& xGenericUICommands, const Reference< XComponentContext >& rxContext );
-        virtual                   ~ConfigurationAccess_UICategory();
+        virtual                   ~ConfigurationAccess_UICategory() override;
 
         // XNameAccess
         virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
@@ -373,7 +373,7 @@ class UICategoryDescription :  public UICommandDescription
 {
 public:
     explicit UICategoryDescription( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual ~UICategoryDescription();
+    virtual ~UICategoryDescription() override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 61056c1b35f0..33b7cd1a7ad0 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -85,7 +85,7 @@ public:
     }
 
     explicit UIConfigurationManager( const css::uno::Reference< css::uno::XComponentContext > & rxContext );
-    virtual ~UIConfigurationManager();
+    virtual ~UIConfigurationManager() override;
 
     // XComponent
     virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 1e6463996949..cc2a6052396d 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -104,7 +104,7 @@ class ConfigurationAccess_WindowState : public  ::cppu::WeakImplHelper< XNameCon
 {
     public:
                                   ConfigurationAccess_WindowState( const OUString& aWindowStateConfigFile, const Reference< XComponentContext >& rxContext );
-        virtual                   ~ConfigurationAccess_WindowState();
+        virtual                   ~ConfigurationAccess_WindowState() override;
 
         // XNameAccess
         virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
@@ -1267,7 +1267,7 @@ class WindowStateConfiguration : private cppu::BaseMutex,
 {
 public:
     explicit WindowStateConfiguration( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual ~WindowStateConfiguration();
+    virtual ~WindowStateConfiguration() override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index c0953b223ea1..eef9ac9bf288 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -54,7 +54,7 @@ class ComboBoxControl : public ComboBox
 {
     public:
         ComboBoxControl( vcl::Window* pParent, WinBits nStyle, ComboboxToolbarController* pComboboxToolbarController );
-        virtual ~ComboBoxControl();
+        virtual ~ComboBoxControl() override;
         virtual void dispose() override;
 
         virtual void Select() override;
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index f9852acbceab..a124f2eecc57 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -179,7 +179,7 @@ class ControlMenuController :  public svt::PopupMenuControllerBase
 
 public:
     explicit ControlMenuController( const uno::Reference< uno::XComponentContext >& xContext );
-    virtual ~ControlMenuController();
+    virtual ~ControlMenuController() override;
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 48b9c386895c..e0de120fd08b 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -53,7 +53,7 @@ class ListBoxControl : public ListBox
 {
     public:
         ListBoxControl( vcl::Window* pParent, WinBits nStyle, DropdownToolbarController* pListBoxListener );
-        virtual ~ListBoxControl();
+        virtual ~ListBoxControl() override;
         virtual void dispose() override;
 
         virtual void Select() override;
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index d860d1f65f16..ccd7a383e42f 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -52,7 +52,7 @@ class EditControl : public Edit
 {
     public:
         EditControl( vcl::Window* pParent, WinBits nStyle, EditToolbarController* pEditToolbarController );
-        virtual ~EditControl();
+        virtual ~EditControl() override;
         virtual void dispose() override;
 
         virtual void Modify() override;
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 46fd4e0f9799..b4ec343fdc44 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -313,7 +313,7 @@ class Toolbarmenu : public ::PopupMenu
 {
     public:
     Toolbarmenu();
-    virtual ~Toolbarmenu();
+    virtual ~Toolbarmenu() override;
     virtual void dispose() override;
 };
 
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 5298d40b253a..180842d1c1d7 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -95,7 +95,7 @@ public:
     virtual void SAL_CALL click( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override;
 
 private:
-    virtual ~LangSelectionStatusbarController() {}
+    virtual ~LangSelectionStatusbarController() override {}
 
     bool            m_bShowMenu;        // if the menu is to be displayed or not (depending on the selected object/text)
     SvtScriptType   m_nScriptType;      // the flags for the different script types available in the selection, LATIN = 0x0001, ASIAN = 0x0002, COMPLEX = 0x0004
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index af030ff3fc0a..8e1f55917dc0 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -717,7 +717,7 @@ public:
     QuietInteractionContext& operator=(const QuietInteractionContext&) = delete;
 
 private:
-    virtual ~QuietInteractionContext() {}
+    virtual ~QuietInteractionContext() override {}
 
     virtual css::uno::Any SAL_CALL getValueByName(
         OUString const & Name)
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index ba6464785ed9..69ea33010a41 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -57,7 +57,7 @@ class ObjectMenuController :  public svt::PopupMenuControllerBase
 
 public:
     explicit ObjectMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext );
-    virtual ~ObjectMenuController();
+    virtual ~ObjectMenuController() override;
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 52d6746196fe..e23f64ce2fa8 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -62,7 +62,7 @@ typedef cppu::ImplInheritanceHelper< svt::ToolboxController,
 class PopupMenuToolbarController : public ToolBarBase
 {
 public:
-    virtual ~PopupMenuToolbarController();
+    virtual ~PopupMenuToolbarController() override;
 
     // XComponent
     virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 57574e93b3c4..1495d5d79903 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -61,7 +61,7 @@ class RecentFilesMenuController :  public svt::PopupMenuControllerBase
 public:
     RecentFilesMenuController( const uno::Reference< uno::XComponentContext >& xContext,
                                const uno::Sequence< uno::Any >& args );
-    virtual ~RecentFilesMenuController();
+    virtual ~RecentFilesMenuController() override;
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx
index cfb2d839b565..0b65e07d49c4 100644
--- a/framework/source/uielement/resourcemenucontroller.cxx
+++ b/framework/source/uielement/resourcemenucontroller.cxx
@@ -28,7 +28,7 @@ class ResourceMenuController : public cppu::ImplInheritanceHelper< svt::PopupMen
 public:
     ResourceMenuController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             const css::uno::Sequence< css::uno::Any >& rxArgs, bool bToolbarContainer );
-    virtual ~ResourceMenuController();
+    virtual ~ResourceMenuController() override;
 
     // XPopupMenuController
     virtual void SAL_CALL updatePopupMenu() throw ( css::uno::RuntimeException, std::exception ) override;
diff --git a/framework/source/uielement/saveasmenucontroller.cxx b/framework/source/uielement/saveasmenucontroller.cxx
index f591c405accc..0941552678d4 100644
--- a/framework/source/uielement/saveasmenucontroller.cxx
+++ b/framework/source/uielement/saveasmenucontroller.cxx
@@ -32,7 +32,7 @@ class SaveAsMenuController :  public svt::PopupMenuControllerBase
 {
 public:
     explicit SaveAsMenuController( const uno::Reference< uno::XComponentContext >& xContext );
-    virtual ~SaveAsMenuController();
+    virtual ~SaveAsMenuController() override;
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 19b324d57fce..799e44407c84 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -57,7 +57,7 @@ class SpinfieldControl : public SpinField
 {
     public:
         SpinfieldControl( vcl::Window* pParent, WinBits nStyle, SpinfieldToolbarController* pSpinfieldToolbarController );
-        virtual ~SpinfieldControl();
+        virtual ~SpinfieldControl() override;
         virtual void dispose() override;
 
         virtual void Up() override;
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx
index 40f7630b0876..858933b3e48c 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -48,7 +48,7 @@ class SubToolBarController : public ToolBarBase
     void disposeUIElement();
 public:
     explicit SubToolBarController( const css::uno::Sequence< css::uno::Any >& rxArgs );
-    virtual ~SubToolBarController();
+    virtual ~SubToolBarController() override;
 
     // XInitialization
     virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rxArgs ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
diff --git a/framework/source/uielement/thesaurusmenucontroller.cxx b/framework/source/uielement/thesaurusmenucontroller.cxx
index bf46b799f297..9d55af45c520 100644
--- a/framework/source/uielement/thesaurusmenucontroller.cxx
+++ b/framework/source/uielement/thesaurusmenucontroller.cxx
@@ -30,7 +30,7 @@ class ThesaurusMenuController : public svt::PopupMenuControllerBase
 {
 public:
     explicit ThesaurusMenuController( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual ~ThesaurusMenuController();
+    virtual ~ThesaurusMenuController() override;
 
     // XStatusListener
     virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 5d5b44732e87..63fd3e9fa5c3 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -84,7 +84,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
     osl::Mutex m_aMutex;
     public:
                                   ConfigurationAccess_UICommand( const OUString& aModuleName, const Reference< XNameAccess >& xGenericUICommands, const Reference< XComponentContext >& rxContext );
-        virtual                   ~ConfigurationAccess_UICommand();
+        virtual                   ~ConfigurationAccess_UICommand() override;
 
         // XNameAccess
         virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx
index 2003669ceff7..776ea27edebb 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -55,7 +55,7 @@ class AddonsToolBarFactory :  public ::cppu::WeakImplHelper< css::lang::XService
 {
 public:
     explicit AddonsToolBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
-    virtual ~AddonsToolBarFactory();
+    virtual ~AddonsToolBarFactory() override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx
index fb6cdb48fb45..ad280b406c59 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -47,7 +47,7 @@ class UIControllerFactory : private cppu::BaseMutex,
                             public UIControllerFactory_BASE
 {
 public:
-    virtual ~UIControllerFactory();
+    virtual ~UIControllerFactory() override;
 
     // XMultiComponentFactory
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const OUString& aServiceSpecifier, const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index dea425323d5a..fab00c2e49a4 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -352,7 +352,7 @@ class UIElementFactoryManager : private cppu::BaseMutex,
     virtual void SAL_CALL disposing() override;
 public:
     explicit UIElementFactoryManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual ~UIElementFactoryManager();
+    virtual ~UIElementFactoryManager() override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index 1e93334efbec..08cbbe3f30b4 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -50,7 +50,7 @@ class WindowContentFactoryManager : private cppu::BaseMutex,
 {
 public:
     explicit WindowContentFactoryManager( const css::uno::Reference< css::uno::XComponentContext>& rxContext );
-    virtual ~WindowContentFactoryManager();
+    virtual ~WindowContentFactoryManager() override;
 
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override