From 91dd2db17bd6cb9b357d1d69b187174e31eabef0 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 13 Sep 2016 13:09:01 +0200
Subject: 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
---
 vcl/workben/icontest.cxx  | 2 +-
 vcl/workben/svpclient.cxx | 2 +-
 vcl/workben/vcldemo.cxx   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'vcl/workben')

diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index f5028b92c4ee..ae2973b7feef 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -74,7 +74,7 @@ public:
     VclPtr<FixedBitmap> mpFixedBitmap;
 
     MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle );
-    virtual ~MyWorkWindow() { disposeOnce(); }
+    virtual ~MyWorkWindow() override { disposeOnce(); }
     virtual void dispose() override { mpFixedBitmap.clear(); WorkWindow::dispose(); }
     void LoadGraphic( const OUString& sImageFile );
 
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index bcb14219e6a3..1fe64da78e64 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -108,7 +108,7 @@ public:
     virtual void Resize() override;
 
     virtual bool Close() override;
-    virtual ~MyWin() { disposeOnce(); }
+    virtual ~MyWin() override { disposeOnce(); }
     virtual void dispose() override;
 
     void parseList( const OString& rList );
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index e6cb4c432d4c..368e30bb0114 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1716,7 +1716,7 @@ class DemoWin : public WorkWindow
             maDelay.Nanosec = 0;
             launch();
         }
-        virtual ~RenderThread()
+        virtual ~RenderThread() override
         {
             join();
         }
@@ -1740,7 +1740,7 @@ public:
         mrRenderer.addInvalidate(this);
         underTesting = false;
     }
-    virtual ~DemoWin()
+    virtual ~DemoWin() override
     {
         disposeOnce();
     }
@@ -1876,7 +1876,7 @@ public:
 
         Show();
     }
-    virtual ~DemoWidgets() { disposeOnce(); }
+    virtual ~DemoWidgets() override { disposeOnce(); }
     virtual void dispose() override
     {
         mpGLButton.disposeAndClear();
-- 
cgit