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

26 files changed, 36 insertions, 36 deletions

diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx
index 0eeb60830fa9..6f6e64c83f6a 100644
--- a/vcl/inc/unx/cupsmgr.hxx
+++ b/vcl/inc/unx/cupsmgr.hxx
@@ -59,7 +59,7 @@ class CUPSManager : public PrinterInfoManager
     bool                                                        m_bPPDThreadRunning;
 
     CUPSManager();
-    virtual ~CUPSManager();
+    virtual ~CUPSManager() override;
 
     virtual void initialize() override;
 
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 1aca67c0e231..76ab0644c29a 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -227,7 +227,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
            because they should be fairly unique */
 
         Type1FontFile() : PrintFont( fonttype::Type1 ), m_nDirectory( 0 ) {}
-        virtual ~Type1FontFile();
+        virtual ~Type1FontFile() override;
         virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider ) override;
     };
 
@@ -239,7 +239,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
         unsigned int  m_nTypeFlags;       // copyright bits and PS-OpenType flag
 
         TrueTypeFontFile();
-        virtual ~TrueTypeFontFile();
+        virtual ~TrueTypeFontFile() override;
         virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider ) override;
     };
 
diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx
index b2223b5c934f..943b9193996e 100644
--- a/vcl/inc/unx/gendata.hxx
+++ b/vcl/inc/unx/gendata.hxx
@@ -33,7 +33,7 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
     OUString      m_aUnicodeEntry;
  public:
     SalGenericData( SalGenericDataType t, SalInstance *pInstance ) : SalData(), m_eType( t ), m_pDisplay( nullptr ) { m_pInstance = pInstance; SetSalData( this ); }
-    virtual ~SalGenericData() {}
+    virtual ~SalGenericData() override {}
     virtual void Dispose() {}
 
     SalGenericDisplay *GetDisplay() const { return m_pDisplay; }
diff --git a/vcl/inc/unx/geninst.h b/vcl/inc/unx/geninst.h
index 4b05f7332940..060f751a430f 100644
--- a/vcl/inc/unx/geninst.h
+++ b/vcl/inc/unx/geninst.h
@@ -56,7 +56,7 @@ protected:
 
 public:
                         SalYieldMutex();
-                        virtual ~SalYieldMutex();
+                        virtual ~SalYieldMutex() override;
 
     virtual void        acquire() override;
     virtual void        release() override;
@@ -80,7 +80,7 @@ protected:
 public:
     SalGenericInstance( SalYieldMutex* pMutex )
         : mbPrinterInit( false ), mpSalYieldMutex( pMutex ) {}
-    virtual ~SalGenericInstance();
+    virtual ~SalGenericInstance() override;
 
     // Yield mutex
     virtual comphelper::SolarMutex* GetYieldMutex() override;
diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h
index 94a4046a08a0..e6561e49a089 100644
--- a/vcl/inc/unx/genprn.h
+++ b/vcl/inc/unx/genprn.h
@@ -35,7 +35,7 @@ public:
     psp::PrinterGfx         m_aPrinterGfx;
 
     PspSalInfoPrinter();
-    virtual ~PspSalInfoPrinter();
+    virtual ~PspSalInfoPrinter() override;
 
     // override all pure virtual methods
     virtual SalGraphics*            AcquireGraphics() override;
@@ -70,7 +70,7 @@ public:
     bool                    m_bIsPDFWriterJob;
 
     PspSalPrinter( SalInfoPrinter *pPrinter );
-    virtual ~PspSalPrinter();
+    virtual ~PspSalPrinter() override;
 
     // override all pure virtual methods
     virtual bool                    StartJob( const OUString* pFileName,
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index 6451a7362900..9810d5d1e748 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -50,7 +50,7 @@ class VCL_DLLPUBLIC GenPspGraphics : public SalGraphics
     SalInfoPrinter*         m_pInfoPrinter;
 public:
                             GenPspGraphics();
-    virtual                ~GenPspGraphics();
+    virtual                ~GenPspGraphics() override;
 
     void                    Init( psp::JobData* pJob, psp::PrinterGfx* pGfx,
                                   SalInfoPrinter* pInfoPrinter );
diff --git a/vcl/inc/unx/gensys.h b/vcl/inc/unx/gensys.h
index 4edd21a7f3dc..fabc6937b586 100644
--- a/vcl/inc/unx/gensys.h
+++ b/vcl/inc/unx/gensys.h
@@ -32,7 +32,7 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem
 {
  public:
     SalGenericSystem();
-    virtual ~SalGenericSystem();
+    virtual ~SalGenericSystem() override;
     virtual int ShowNativeDialog( const OUString& rTitle,
                                   const OUString& rMessage,
                                   const std::list< OUString >& rButtons,
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index f3754a3067d5..2f038ee3cef7 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -247,7 +247,7 @@ class VCL_DLLPUBLIC ServerFontInstance : public LogicalFontInstance
 {
 public:
                             ServerFontInstance( FontSelectPattern& );
-    virtual                 ~ServerFontInstance();
+    virtual                 ~ServerFontInstance() override;
 
     void                    SetServerFont(ServerFont* p);
     void                    HandleFontOptions();
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 21a407b8bcef..f5e1e03a6674 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -84,7 +84,7 @@ class GtkSalTimer : public SalTimer
     struct SalGtkTimeoutSource *m_pTimeout;
 public:
     GtkSalTimer();
-    virtual ~GtkSalTimer();
+    virtual ~GtkSalTimer() override;
     virtual void Start( sal_uLong nMS ) override;
     virtual void Stop() override;
     bool         Expired();
@@ -101,7 +101,7 @@ class GtkData : public SalGenericData
 
 public:
     GtkData( SalInstance *pInstance );
-    virtual ~GtkData();
+    virtual ~GtkData() override;
 
     void Init();
     virtual void Dispose() override;
@@ -140,7 +140,7 @@ class GtkSalDisplay : public SalDisplay
                            int nWidth, int nHeight, int nXHot, int nYHot );
 public:
              GtkSalDisplay( GdkDisplay* pDisplay );
-    virtual ~GtkSalDisplay();
+    virtual ~GtkSalDisplay() override;
 
     GdkDisplay* GetGdkDisplay() const { return m_pGdkDisplay; }
     bool        IsX11Display() const { return m_bX11Display; }
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 4f07262a5af1..b9fafd639bd1 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -424,7 +424,7 @@ public:
     static void closePopup();
 
 #endif
-    virtual ~GtkSalFrame();
+    virtual ~GtkSalFrame() override;
 
     // SalGraphics or NULL, but two Graphics for all SalFrames
     // must be returned
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 563bc74a0b14..cd369e52ef37 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -201,7 +201,7 @@ class GtkSalGraphics : public X11SalGraphics
 
 public:
     GtkSalGraphics(GtkSalFrame *, GtkWidget *window, SalX11Screen nXScreen);
-    virtual ~GtkSalGraphics();
+    virtual ~GtkSalGraphics() override;
 
     inline GtkWidget*  GetGtkWidget() const { return m_pWindow; }
     inline GdkWindow*  GetGdkWindow() const { return m_pWindow->window; }
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index cd38d12b6574..490cf698c2da 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -99,7 +99,7 @@ class GtkDropTarget : public cppu::WeakComponentImplHelper<css::datatransfer::dn
     std::list<css::uno::Reference<css::datatransfer::dnd::XDropTargetListener>> m_aListeners;
 public:
     GtkDropTarget();
-    virtual ~GtkDropTarget();
+    virtual ~GtkDropTarget() override;
 
     // XInitialization
     virtual void        SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArgs)
@@ -147,7 +147,7 @@ public:
     {
     }
 
-    virtual ~GtkDragSource();
+    virtual ~GtkDragSource() override;
 
     // XDragSource
     virtual sal_Bool    SAL_CALL isDragImageSupported() throw(std::exception) override;
@@ -198,7 +198,7 @@ class GtkInstance : public X11SalInstance
 #endif
 public:
             GtkInstance( SalYieldMutex* pMutex );
-    virtual ~GtkInstance();
+    virtual ~GtkInstance() override;
     void    EnsureInit();
     virtual void AfterAppInit() override;
 
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index 55896a281aca..df36a85ff187 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -41,7 +41,7 @@ class GtkSalObject : public SalObject
     static void         signalDestroy( GtkWidget*, gpointer );
 public:
     GtkSalObject( GtkSalFrame* pParent, bool bShow = true );
-    virtual ~GtkSalObject();
+    virtual ~GtkSalObject() override;
 
     // override all pure virtual methods
     virtual void                    ResetClipRegion() override;
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 48e937324ae0..460a0e57fde0 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -67,7 +67,7 @@ private:
 
 public:
     GtkSalMenu( bool bMenuBar );
-    virtual ~GtkSalMenu();
+    virtual ~GtkSalMenu() override;
 
     virtual bool                VisibleMenuBar() override;   // must return TRUE to actually DISPLAY native menu bars
                                                     // otherwise only menu messages are processed (eg, OLE on Windows)
@@ -135,7 +135,7 @@ class GtkSalMenuItem : public SalMenuItem
 {
 public:
     GtkSalMenuItem( const SalItemParams* );
-    virtual ~GtkSalMenuItem();
+    virtual ~GtkSalMenuItem() override;
 
     sal_uInt16          mnId;               // Item ID
     MenuItemType        mnType;             // Item type
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index 9f2fb5cf3dab..b8ebbdf0574d 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -23,7 +23,7 @@ class GtkSalSystem : public SalGenericSystem
     ScreenMonitors_t maScreenMonitors;
 public:
              GtkSalSystem();
-    virtual ~GtkSalSystem();
+    virtual ~GtkSalSystem() override;
     static   GtkSalSystem *GetSingleton();
 
     virtual bool          IsUnifiedDisplay() override;
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index e0929db1b2e0..f8cc4614c811 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -42,7 +42,7 @@ class X11ImeStatus : public SalI18NImeStatus
 {
 public:
     X11ImeStatus() {}
-    virtual ~X11ImeStatus();
+    virtual ~X11ImeStatus() override;
 
     virtual bool canToggle() override;
     virtual void toggle() override;
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 88a8668aed9f..81998ba35bea 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -109,7 +109,7 @@ public:
 public:
 
                                 X11SalBitmap();
-    virtual                     ~X11SalBitmap();
+    virtual                     ~X11SalBitmap() override;
 
     // override pure virtual methods
     virtual bool                Create(
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index 72e82df89f71..a115298c3a63 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -60,7 +60,7 @@ protected:
 
 public:
              X11SalData( SalGenericDataType t, SalInstance *pInstance );
-    virtual ~X11SalData();
+    virtual ~X11SalData() override;
 
     virtual void            Init();
     virtual void            Dispose() override;
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 91cbad7eae28..7be3df6563ad 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -200,7 +200,7 @@ public:
 
     GLX11Window();
     virtual bool Synchronize(bool bOnoff) const override;
-    virtual ~GLX11Window();
+    virtual ~GLX11Window() override;
 };
 
 class VCLPLUG_GEN_PUBLIC SalDisplay : public SalGenericDisplay
@@ -303,7 +303,7 @@ public:
 
                     SalDisplay( Display* pDisp );
 
-    virtual        ~SalDisplay();
+    virtual        ~SalDisplay() override;
 
     void            Init();
 
@@ -387,7 +387,7 @@ class VCLPLUG_GEN_PUBLIC SalX11Display : public SalDisplay
 {
 public:
              SalX11Display( Display* pDisp );
-    virtual ~SalX11Display();
+    virtual ~SalX11Display() override;
 
     virtual bool        Dispatch( XEvent *pEvent ) override;
     virtual void        Yield();
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 057520b875cb..07a285353460 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -159,7 +159,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl
     void            updateWMClass();
 public:
     X11SalFrame( SalFrame* pParent, SalFrameStyleFlags nSalFrameStyle, SystemParentData* pSystemParent = nullptr );
-    virtual ~X11SalFrame();
+    virtual ~X11SalFrame() override;
 
     long            Dispatch( XEvent *pEvent );
     void            Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nScreen,
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 73f22b7e7816..803c75addb6b 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -73,7 +73,7 @@ class VCLPLUG_GEN_PUBLIC X11SalGraphics : public SalGraphics
 
 public:
                                     X11SalGraphics();
-    virtual                         ~X11SalGraphics();
+    virtual                         ~X11SalGraphics() override;
 
     void                            Init( SalFrame *pFrame, Drawable aDrawable, SalX11Screen nXScreen );
     void                            Init( X11SalVirtualDevice *pVirtualDevice, SalColormap* pColormap = nullptr, bool bDeleteColormap = false );
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 5bf339b220c8..fdb1dee6b5a7 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -45,7 +45,7 @@ protected:
 
 public:
     explicit X11SalInstance(SalYieldMutex* pMutex);
-    virtual ~X11SalInstance();
+    virtual ~X11SalInstance() override;
 
     virtual SalFrame*           CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override;
     virtual SalFrame*           CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index a163ea9fff7b..ffc738aa6987 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -64,7 +64,7 @@ public:
     static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow );
 
     X11SalObject();
-    virtual ~X11SalObject();
+    virtual ~X11SalObject() override;
 
     // override all pure virtual methods
     virtual void                    ResetClipRegion() override;
diff --git a/vcl/inc/unx/saltimer.h b/vcl/inc/unx/saltimer.h
index 108404e08037..93d4ad613b52 100644
--- a/vcl/inc/unx/saltimer.h
+++ b/vcl/inc/unx/saltimer.h
@@ -28,7 +28,7 @@ class X11SalTimer : public SalTimer
     SalXLib *mpXLib;
 public:
     X11SalTimer( SalXLib *pXLib ) : mpXLib( pXLib ) {}
-    virtual ~X11SalTimer();
+    virtual ~X11SalTimer() override;
 
     // override all pure virtual methods
     void  Start( sal_uIntPtr nMS ) override;
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index f7e59ebdbe12..aa9cffff5f82 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -47,7 +47,7 @@ public:
     X11SalVirtualDevice(SalGraphics *pGraphics, long &nDX, long &nDY,
             DeviceFormat eFormat, const SystemGraphicsData *pData, X11SalGraphics* pNewGraphics);
 
-    virtual ~X11SalVirtualDevice();
+    virtual ~X11SalVirtualDevice() override;
 
     Display *GetXDisplay() const
     {
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index 61505ce50c9a..a5937fe074f9 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -29,7 +29,7 @@ class VCLPLUG_GEN_PUBLIC X11SalSystem : public SalGenericSystem
 {
 public:
     X11SalSystem() {}
-    virtual ~X11SalSystem();
+    virtual ~X11SalSystem() override;
 
     // override pure virtual methods
     virtual unsigned int GetDisplayScreenCount() override;