diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
| commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
| tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /desktop/source/splash | |
| parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) | |
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
Diffstat (limited to 'desktop/source/splash')
| -rw-r--r-- | desktop/source/splash/splash.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/splash/unxsplash.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index aa33a5c16fca..c86db11363d4 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -55,7 +55,7 @@ public: SplashScreen *pSpl; ScopedVclPtr<VirtualDevice> _vdev; explicit SplashScreenWindow(SplashScreen *); - virtual ~SplashScreenWindow() { disposeOnce(); } + virtual ~SplashScreenWindow() override { disposeOnce(); } virtual void dispose() override; // workwindow virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; @@ -73,7 +73,7 @@ private: VclPtr<SplashScreenWindow> pWindow; DECL_LINK_TYPED( AppEventListenerHdl, VclSimpleEvent&, void ); - virtual ~SplashScreen(); + virtual ~SplashScreen() override; void loadConfig(); void updateStatus(); void SetScreenBitmap(BitmapEx &rBitmap); diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx index 4935777eaf2d..e854387fa3ff 100644 --- a/desktop/source/splash/unxsplash.hxx +++ b/desktop/source/splash/unxsplash.hxx @@ -34,7 +34,7 @@ private: UnxSplashScreen( const UnxSplashScreen& ) = delete; UnxSplashScreen operator =( const UnxSplashScreen& ) = delete; - virtual ~UnxSplashScreen(); + virtual ~UnxSplashScreen() override; static UnxSplashScreen *m_pINSTANCE; |