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

17 files changed, 37 insertions, 37 deletions

diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx
index 4acfd46b055d..c2bccd999065 100644
--- a/include/toolkit/awt/animatedimagespeer.hxx
+++ b/include/toolkit/awt/animatedimagespeer.hxx
@@ -48,7 +48,7 @@ namespace toolkit
         AnimatedImagesPeer();
 
     protected:
-        virtual ~AnimatedImagesPeer();
+        virtual ~AnimatedImagesPeer() override;
 
     public:
         // XAnimation
diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx
index 2f7269587bb4..1c73a62b4414 100644
--- a/include/toolkit/awt/scrollabledialog.hxx
+++ b/include/toolkit/awt/scrollabledialog.hxx
@@ -54,7 +54,7 @@ namespace toolkit
         void    lcl_Scroll( long nX, long nY );
     public:
         ScrollableWrapper( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG, Dialog::InitFlag eFlag = Dialog::InitFlag::Default );
-        virtual ~ScrollableWrapper();
+        virtual ~ScrollableWrapper() override;
         virtual void dispose() override;
         virtual void    SetScrollWidth( long nWidth ) override;
         virtual void    SetScrollHeight( long nHeight ) override;
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index b6a556b6a2e7..1fea9e5c9851 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -78,7 +78,7 @@ protected:
 
 public:
     VCLXAccessibleComponent( VCLXWindow* pVCLXWindow );
-    virtual ~VCLXAccessibleComponent();
+    virtual ~VCLXAccessibleComponent() override;
 
     VCLXWindow*    GetVCLXWindow() const;
     VclPtr<vcl::Window> GetWindow() const;
diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx
index 732d7d200f05..bcf7bbf4755f 100644
--- a/include/toolkit/awt/vclxcontainer.hxx
+++ b/include/toolkit/awt/vclxcontainer.hxx
@@ -39,7 +39,7 @@ class TOOLKIT_DLLPUBLIC VCLXContainer : public css::awt::XVclContainer,
 {
 public:
                     VCLXContainer();
-                    virtual ~VCLXContainer();
+                    virtual ~VCLXContainer() override;
 
     // css::uno::XInterface
     css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx
index 5fb5add9f179..2b59cee62f3e 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -56,7 +56,7 @@ public:
 
 public:
                             VCLXDevice();
-                            virtual ~VCLXDevice();
+                            virtual ~VCLXDevice() override;
 
     void                    SetOutputDevice( const VclPtr<OutputDevice> &pOutDev ) { mpOutputDevice = pOutDev; }
     const VclPtr<OutputDevice>& GetOutputDevice() const { return mpOutputDevice; }
@@ -102,7 +102,7 @@ public:
 class VCLXVirtualDevice : public VCLXDevice
 {
 public:
-                    virtual ~VCLXVirtualDevice();
+                    virtual ~VCLXVirtualDevice() override;
 
     void            SetVirtualDevice( VirtualDevice* pVDev ) { SetOutputDevice( pVDev ); }
 };
diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
index 85b00d1cad4d..d9550e742e82 100644
--- a/include/toolkit/awt/vclxfont.hxx
+++ b/include/toolkit/awt/vclxfont.hxx
@@ -50,7 +50,7 @@ protected:
 
 public:
                     VCLXFont();
-                    virtual ~VCLXFont();
+                    virtual ~VCLXFont() override;
 
     void            Init( css::awt::XDevice& rxDev, const vcl::Font& rFont );
     const vcl::Font&     GetFont() const { return maFont; }
diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx
index d7111f36a6ad..5f689db070c1 100644
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
@@ -76,7 +76,7 @@ private:
 
 public:
                     VCLXGraphics();
-                    virtual ~VCLXGraphics();
+                    virtual ~VCLXGraphics() override;
 
     void            Init( OutputDevice* pOutDev );
     void            InitOutputDevice( InitOutDevFlags nFlags );
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx
index e042e014ea14..8ca1ab2bece9 100644
--- a/include/toolkit/awt/vclxmenu.hxx
+++ b/include/toolkit/awt/vclxmenu.hxx
@@ -74,7 +74,7 @@ protected:
 public:
     VCLXMenu();
     VCLXMenu( Menu* pMenu );
-    virtual ~VCLXMenu();
+    virtual ~VCLXMenu() override;
 
 
     Menu*    GetMenu() const { return mpMenu; }
diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx
index 145d3bc7f99f..dff64dae6115 100644
--- a/include/toolkit/awt/vclxpointer.hxx
+++ b/include/toolkit/awt/vclxpointer.hxx
@@ -45,7 +45,7 @@ protected:
 
 public:
     VCLXPointer();
-    virtual ~VCLXPointer();
+    virtual ~VCLXPointer() override;
 
     const Pointer&      GetPointer() const { return maPointer; }
 
diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx
index 4fe541f15833..c9a80375c5f7 100644
--- a/include/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
@@ -64,7 +64,7 @@ protected:
     bool                        mbHorizontal;
 public:
     VCLXPrinterPropertySet( const OUString& rPrinterName );
-    virtual ~VCLXPrinterPropertySet();
+    virtual ~VCLXPrinterPropertySet() override;
 
     Printer*                    GetPrinter() const { return mxPrinter.get(); }
     css::uno::Reference< css::awt::XDevice > const &  GetDevice();
@@ -112,7 +112,7 @@ class VCLXPrinter:  public VCLXPrinter_Base
     JobSetup                                      maInitJobSetup;
 public:
                     VCLXPrinter( const OUString& rPrinterName );
-                    virtual ~VCLXPrinter();
+                    virtual ~VCLXPrinter() override;
 
     // css::beans::XPropertySet
     css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertySetInfo(); }
@@ -149,7 +149,7 @@ class VCLXInfoPrinter:  public VCLXInfoPrinter_Base
 {
 public:
                         VCLXInfoPrinter( const OUString& rPrinterName );
-                        virtual ~VCLXInfoPrinter();
+                        virtual ~VCLXInfoPrinter() override;
 
     // css::beans::XPropertySet
     css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertySetInfo(); }
diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx
index 6225b258a18f..81b6ba2256ef 100644
--- a/include/toolkit/awt/vclxregion.hxx
+++ b/include/toolkit/awt/vclxregion.hxx
@@ -47,7 +47,7 @@ protected:
 
 public:
                     VCLXRegion();
-                    virtual ~VCLXRegion();
+                    virtual ~VCLXRegion() override;
 
     const vcl::Region&   GetRegion() const                   { return maRegion; }
 
diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx
index 6d932925075f..81fe3ae82736 100644
--- a/include/toolkit/awt/vclxspinbutton.hxx
+++ b/include/toolkit/awt/vclxspinbutton.hxx
@@ -45,7 +45,7 @@ namespace toolkit
         VCLXSpinButton();
 
     protected:
-        virtual ~VCLXSpinButton( );
+        virtual ~VCLXSpinButton( ) override;
 
         // XInterface
         DECLARE_XINTERFACE()
diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx
index 684136cf5f5e..3c6d19d75695 100644
--- a/include/toolkit/awt/vclxsystemdependentwindow.hxx
+++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx
@@ -37,7 +37,7 @@ class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow : public css::awt::XSystemDepe
 {
 public:
     VCLXSystemDependentWindow();
-    virtual ~VCLXSystemDependentWindow();
+    virtual ~VCLXSystemDependentWindow() override;
 
     // css::uno::XInterface
     css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx
index d8e90ab8e9af..77f2dab6c1f3 100644
--- a/include/toolkit/awt/vclxtabpagecontainer.hxx
+++ b/include/toolkit/awt/vclxtabpagecontainer.hxx
@@ -42,7 +42,7 @@ class VCLXTabPageContainer : public VCLXTabPageContainer_Base
 {
 public:
     VCLXTabPageContainer();
-    virtual ~VCLXTabPageContainer();
+    virtual ~VCLXTabPageContainer() override;
 
     // css::awt::XView
     void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index f80734e626d3..ba0ddafdb4fa 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -90,7 +90,7 @@ protected:
 
 public:
     VCLXTopWindow(bool bWHWND = false);
-    virtual ~VCLXTopWindow();
+    virtual ~VCLXTopWindow() override;
 
     // css::uno::XInterface
     css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 775d38e84d06..af10c4f0aa41 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -124,7 +124,7 @@ protected:
 
 public:
     VCLXWindow( bool bWithDefaultProps = false );
-    virtual ~VCLXWindow();
+    virtual ~VCLXWindow() override;
 
     virtual void SetWindow( const VclPtr< vcl::Window > &pWindow );
     template< class derived_type > VclPtr< derived_type > GetAs() const {
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index 84830085c813..62a8bc2afd05 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -161,7 +161,7 @@ protected:
 
 public:
                     VCLXButton();
-    virtual ~VCLXButton();
+    virtual ~VCLXButton() override;
 
     // css::lang::XComponent
     void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
@@ -197,7 +197,7 @@ class VCLXImageControl : public VCLXGraphicControl
 {
 public:
                     VCLXImageControl();
-                    virtual ~VCLXImageControl();
+                    virtual ~VCLXImageControl() override;
 
     // css::awt::XLayoutConstrains
     css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
@@ -339,7 +339,7 @@ class VCLXMessageBox :  public css::awt::XMessageBox,
 {
 public:
                         VCLXMessageBox();
-                        virtual ~VCLXMessageBox();
+                        virtual ~VCLXMessageBox() override;
 
     // css::uno::XInterface
     css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -375,7 +375,7 @@ protected:
 
 public:
     VCLXFrame();
-    virtual ~VCLXFrame();
+    virtual ~VCLXFrame() override;
 
     // css::uno::XInterface
     css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -407,7 +407,7 @@ class TOOLKIT_DLLPUBLIC VCLXDialog :    public css::awt::XDialog2,
 {
 public:
                         VCLXDialog();
-                        virtual ~VCLXDialog();
+                        virtual ~VCLXDialog() override;
 
     // css::uno::XInterface
     css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -449,7 +449,7 @@ class VCLXTabPage : public VCLXContainer
 {
 public:
                         VCLXTabPage();
-                        virtual ~VCLXTabPage();
+                        virtual ~VCLXTabPage() override;
 
     // css::uno::XInterface
     css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -482,7 +482,7 @@ protected:
     void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
 public:
     VCLXMultiPage();
-    virtual ~VCLXMultiPage();
+    virtual ~VCLXMultiPage() override;
 
     // css::uno::XInterface
     css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -542,7 +542,7 @@ protected:
 
 public:
     VCLXFixedHyperlink();
-    virtual ~VCLXFixedHyperlink();
+    virtual ~VCLXFixedHyperlink() override;
 
     // css::uno::XInterface
     css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -590,7 +590,7 @@ protected:
 
 public:
                         VCLXFixedText();
-                        virtual ~VCLXFixedText();
+                        virtual ~VCLXFixedText() override;
 
     // css::uno::XInterface
     css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -841,7 +841,7 @@ protected:
 
 public:
                         VCLXComboBox();
-    virtual ~VCLXComboBox();
+    virtual ~VCLXComboBox() override;
 
      // css::lang::XComponent
     void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
@@ -937,7 +937,7 @@ protected:
 
 public:
                     VCLXFormattedSpinField();
-                    virtual ~VCLXFormattedSpinField();
+                    virtual ~VCLXFormattedSpinField() override;
 
     void            SetFormatter( FormatterBase* pFormatter ) { mpFormatter = pFormatter; }
 
@@ -962,7 +962,7 @@ protected:
     virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
 public:
                     VCLXDateField();
-                    virtual ~VCLXDateField();
+                    virtual ~VCLXDateField() override;
 
     // css::uno::XInterface
     css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -1010,7 +1010,7 @@ protected:
     virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
 public:
                     VCLXTimeField();
-                    virtual ~VCLXTimeField();
+                    virtual ~VCLXTimeField() override;
 
     // css::uno::XInterface
     css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -1053,7 +1053,7 @@ class VCLXNumericField :    public css::awt::XNumericField,
 {
 public:
                     VCLXNumericField();
-                    virtual ~VCLXNumericField();
+                    virtual ~VCLXNumericField() override;
 
     // css::uno::XInterface
     css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -1103,7 +1103,7 @@ class VCLXMetricField : public css::awt::XMetricField,
     void CallListeners();
 public:
     VCLXMetricField();
-    virtual ~VCLXMetricField();
+    virtual ~VCLXMetricField() override;
 
     // css::uno::XInterface
     css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -1150,7 +1150,7 @@ class VCLXCurrencyField :   public css::awt::XCurrencyField,
 {
 public:
                     VCLXCurrencyField();
-                    virtual ~VCLXCurrencyField();
+                    virtual ~VCLXCurrencyField() override;
 
     // css::uno::XInterface
     css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -1196,7 +1196,7 @@ class VCLXPatternField :    public css::awt::XPatternField,
 {
 public:
                     VCLXPatternField();
-                    virtual ~VCLXPatternField();
+                    virtual ~VCLXPatternField() override;
 
     // css::uno::XInterface
     css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -1237,7 +1237,7 @@ protected:
 
 public:
                         VCLXToolBox();
-                        virtual ~VCLXToolBox();
+                        virtual ~VCLXToolBox() override;
 };
 
 #endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX