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

2 files changed, 6 insertions, 6 deletions

diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 1b7c08d488a1..ac9f100e285a 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -197,7 +197,7 @@ public:
     );
 
 protected:
-    virtual ~OControl();
+    virtual ~OControl() override;
 
     /** sets the control as delegator at the aggregate
 
@@ -276,7 +276,7 @@ public:
         const bool _bSetDelegator = true
     );
 
-    virtual ~OBoundControl();
+    virtual ~OBoundControl() override;
 
     DECLARE_UNO3_AGG_DEFAULTS(OBoundControl, OControl)
     virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -362,7 +362,7 @@ protected:
         const bool _bCloneAggregate = true,                             // should the aggregate of the original be cloned, too?
         const bool _bSetDelegator = true                                // set to sal_False if you want to call setDelegator later (after returning from this ctor)
     );
-    virtual ~OControlModel();
+    virtual ~OControlModel() override;
 
     /** to be called after a OBoundControlModel (a derivee, respectively) has been cloned
 
@@ -522,7 +522,7 @@ public:
         const classname* _pOriginal, \
         const css::uno::Reference< css::uno::XComponentContext>& _rxFactory \
     ); \
-    virtual ~classname() \
+    virtual ~classname() override \
 
 
 #define IMPLEMENT_DEFAULT_CLONING( classname ) \
@@ -657,7 +657,7 @@ protected:
         const css::uno::Reference< css::uno::XComponentContext>& _rxContext
                                                             // factory to create the aggregate with
     );
-    virtual ~OBoundControlModel();
+    virtual ~OBoundControlModel() override;
 
     /// late ctor after cloning
     virtual void clonedFrom( const OControlModel* _pOriginal ) override;
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index 1bb167620e84..90163803a4e8 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -286,7 +286,7 @@ protected:
 public:
     OFormComponents(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
     OFormComponents( const OFormComponents& _cloneSource );
-    virtual ~OFormComponents();
+    virtual ~OFormComponents() override;
 
     DECLARE_UNO3_AGG_DEFAULTS(OFormComponents, FormComponentsBase)