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

12 files changed, 21 insertions, 21 deletions

diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx
index e7ab21bc16fd..4c977db4f336 100644
--- a/include/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/include/toolkit/controls/accessiblecontrolcontext.hxx
@@ -61,7 +61,7 @@ namespace toolkit
     protected:
         /// ctor. @see Init
         OAccessibleControlContext();
-        virtual ~OAccessibleControlContext();
+        virtual ~OAccessibleControlContext() override;
 
         /** late ctor
         */
diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx
index 6deaaebc6bab..6b165b788dd6 100644
--- a/include/toolkit/controls/animatedimages.hxx
+++ b/include/toolkit/controls/animatedimages.hxx
@@ -72,7 +72,7 @@ namespace toolkit
         virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override;
 
     protected:
-                                        virtual ~AnimatedImagesControlModel();
+                                        virtual ~AnimatedImagesControlModel() override;
 
         css::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
         ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper() override;
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index 17e524c9d5b6..5b90a02251a7 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -102,7 +102,7 @@ protected:
 public:
                         ControlModelContainerBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
                         ControlModelContainerBase( const ControlModelContainerBase& rModel );
-                        virtual ~ControlModelContainerBase();
+                        virtual ~ControlModelContainerBase() override;
 
     UnoControlModel*    Clone() const override;
 
@@ -187,7 +187,7 @@ class ResourceListener  :public css::util::XModifyListener,
 {
     public:
         ResourceListener( const css::uno::Reference< css::util::XModifyListener >& xListener );
-        virtual ~ResourceListener();
+        virtual ~ResourceListener() override;
 
         void startListening( const css::uno::Reference< css::resource::XStringResourceResolver  >& rResource );
         void stopListening();
@@ -237,7 +237,7 @@ protected:
 
 public:
     ControlContainerBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual ~ControlContainerBase();
+    virtual ~ControlContainerBase() override;
 
     DECLIMPL_SERVICEINFO_DERIVED( ControlContainerBase, UnoControlBase, "toolkit.ControlContainerBase" )
 
diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx
index 62325ac20788..aad4e977b9ab 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -49,7 +49,7 @@ private:
 public:
 
                                 UnoDialogControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-                                virtual ~UnoDialogControl();
+                                virtual ~UnoDialogControl() override;
     OUString             GetComponentServiceName() override;
 
     void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
@@ -172,7 +172,7 @@ class UnoMultiPageModel : public ControlModelContainerBase
 {
 public:
     UnoMultiPageModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual ~UnoMultiPageModel();
+    virtual ~UnoMultiPageModel() override;
     UnoMultiPageModel( const UnoMultiPageModel& rModel );
 
     UnoControlModel*    Clone() const override;
@@ -200,7 +200,7 @@ class UnoMultiPageControl :  public ControlContainerBase
     void bindPage( const css::uno::Reference< css::awt::XControl >& _rxControl );
 public:
     UnoMultiPageControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual ~UnoMultiPageControl();
+    virtual ~UnoMultiPageControl() override;
     OUString     GetComponentServiceName() override;
 
     // css::lang::XServiceInfo
@@ -247,7 +247,7 @@ class UnoPageModel : public ControlModelContainerBase
 {
 public:
     UnoPageModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual ~UnoPageModel();
+    virtual ~UnoPageModel() override;
     UnoPageModel( const UnoPageModel& rModel );
 
     UnoControlModel*    Clone() const override;
@@ -269,7 +269,7 @@ class UnoPageControl :  public ControlContainerBase
 {
 public:
     UnoPageControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual ~UnoPageControl();
+    virtual ~UnoPageControl() override;
     OUString     GetComponentServiceName() override;
 
 
@@ -281,7 +281,7 @@ class UnoFrameModel : public ControlModelContainerBase
 {
 public:
     UnoFrameModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual ~UnoFrameModel();
+    virtual ~UnoFrameModel() override;
     UnoFrameModel( const UnoFrameModel& rModel );
 
     UnoControlModel*    Clone() const override;
@@ -302,7 +302,7 @@ protected:
     virtual void        ImplSetPosSize( css::uno::Reference< css::awt::XControl >& rxCtrl ) override;
 public:
     UnoFrameControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual ~UnoFrameControl();
+    virtual ~UnoFrameControl() override;
     OUString     GetComponentServiceName() override;
 
 // css::lang::XServiceInfo
diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx
index f6ef3585ea45..ed993d1911c2 100644
--- a/include/toolkit/controls/formattedcontrol.hxx
+++ b/include/toolkit/controls/formattedcontrol.hxx
@@ -83,7 +83,7 @@ namespace toolkit
             throw (css::uno::RuntimeException, std::exception) override;
 
     protected:
-        virtual ~UnoControlFormattedFieldModel();
+        virtual ~UnoControlFormattedFieldModel() override;
 
         // XComponent
         void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx
index 549e7e12cbdc..49d21e24e158 100644
--- a/include/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
@@ -107,7 +107,7 @@ namespace com { namespace sun { namespace star {
         void releaseAggregation();
 
     protected:
-        virtual ~OGeometryControlModel_Base();
+        virtual ~OGeometryControlModel_Base() override;
 
         // XAggregation
         css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _aType ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx
index d915fc723941..7472b5d74deb 100644
--- a/include/toolkit/controls/stdtabcontroller.hxx
+++ b/include/toolkit/controls/stdtabcontroller.hxx
@@ -50,7 +50,7 @@ protected:
 
 public:
                             StdTabController();
-                            virtual ~StdTabController();
+                            virtual ~StdTabController() override;
 
     static css::uno::Reference< css::awt::XControl >  FindControl( css::uno::Sequence< css::uno::Reference< css::awt::XControl > >& rCtrls, const css::uno::Reference< css::awt::XControlModel > & rxCtrlModel );
 
diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx
index 92d54dbc4386..e1a5b7446eaf 100644
--- a/include/toolkit/controls/stdtabcontrollermodel.hxx
+++ b/include/toolkit/controls/stdtabcontrollermodel.hxx
@@ -99,7 +99,7 @@ protected:
 
 public:
                             StdTabControllerModel();
-                            virtual ~StdTabControllerModel();
+                            virtual ~StdTabControllerModel() override;
 
     // css::uno::XInterface
     css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return OWeakAggObject::queryInterface(rType); }
diff --git a/include/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx
index 4020c35963ef..b60371c92959 100644
--- a/include/toolkit/controls/tabpagemodel.hxx
+++ b/include/toolkit/controls/tabpagemodel.hxx
@@ -69,7 +69,7 @@ private:
 public:
 
     UnoControlTabPage( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual ~UnoControlTabPage();
+    virtual ~UnoControlTabPage() override;
     OUString             GetComponentServiceName() override;
 
     void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx
index fd5fa0a0f618..72d81b6bd8d7 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -137,7 +137,7 @@ protected:
 
 public:
                 UnoControl();
-                virtual ~UnoControl();
+                virtual ~UnoControl() override;
 
                 UnoControlComponentInfos&           GetComponentInfos() { return maComponentInfos; }
 
diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx
index 86e10ae26692..37fd46db86f2 100644
--- a/include/toolkit/controls/unocontrolcontainer.hxx
+++ b/include/toolkit/controls/unocontrolcontainer.hxx
@@ -58,7 +58,7 @@ protected:
 public:
                 UnoControlContainer();
                 UnoControlContainer( const css::uno::Reference< css::awt::XWindowPeer >& xPeer );
-                virtual ~UnoControlContainer();
+                virtual ~UnoControlContainer() override;
 
 
     // css::lang::XComponent
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index c81ba5268627..373e59c80ee2 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -543,7 +543,7 @@ private:
 public:
 
                             UnoCheckBoxControl();
-                            virtual ~UnoCheckBoxControl(){;}
+                            virtual ~UnoCheckBoxControl() override {;}
     OUString         GetComponentServiceName() override;
 
     void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
@@ -798,7 +798,7 @@ public:
                             ConstructorMode const i_mode = ConstructDefault
                         );
                         UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource );
-                        virtual ~UnoControlListBoxModel();
+                        virtual ~UnoControlListBoxModel() override;
 
     UnoControlModel*    Clone() const override { return new UnoControlListBoxModel( *this ); }