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 /sfx2/source/dialog | |
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 'sfx2/source/dialog')
-rw-r--r-- | sfx2/source/dialog/backingcomp.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/backingwindow.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/filedlgimpl.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/infobar.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/mailmodel.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/splitwin.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 248733206e2d..3ba48e3f94fa 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -100,7 +100,7 @@ private: public: explicit BackingComp(const css::uno::Reference< css::uno::XComponentContext >& xContext); - virtual ~BackingComp( ); + virtual ~BackingComp( ) override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index abb68e9c765b..7fe9369e8c43 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -115,7 +115,7 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer public: explicit BackingWindow(vcl::Window* pParent); - virtual ~BackingWindow(); + virtual ~BackingWindow() override; virtual void dispose() override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 017ef84dd18a..b074dc05e17d 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1271,7 +1271,7 @@ class DurationDialog_Impl : public ModalDialog public: DurationDialog_Impl( vcl::Window* pParent, const util::Duration& rDuration ); - virtual ~DurationDialog_Impl(); + virtual ~DurationDialog_Impl() override; virtual void dispose() override; util::Duration GetDuration() const; }; diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 137ad50c3181..66ec34b3d8d3 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -69,7 +69,7 @@ public: SfxChildWindow* pChildWin , vcl::Window* pParent , WinBits nBits); - virtual ~SfxTitleDockingWindow(); + virtual ~SfxTitleDockingWindow() override; virtual void dispose() override; vcl::Window* GetWrappedWindow() const { return m_pWrappedWindow; } diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 7d4697dbb541..d3f0a3c793ea 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -179,7 +179,7 @@ namespace sfx2 const OUString& sStandardDir = OUString(), const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >() ); - virtual ~FileDialogHelper_Impl(); + virtual ~FileDialogHelper_Impl() override; ErrCode execute( std::vector<OUString>& rpURLList, SfxItemSet *& rpSet, diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index e48aaaab8201..df620f809334 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -63,7 +63,7 @@ public: lclDetermineLightDarkColor(m_aBackgroundColor, m_aForegroundColor); } - virtual ~SfxCloseButton() {} + virtual ~SfxCloseButton() override {} virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 9d6e6b3ae1ca..e9bc1be90f0e 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -90,7 +90,7 @@ class PrepareListener_Impl : public ::cppu::WeakImplHelper< css::frame::XStatusL bool m_bState; public: PrepareListener_Impl(); - virtual ~PrepareListener_Impl(); + virtual ~PrepareListener_Impl() override; // css.frame.XStatusListener virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& aEvent) diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index bbe836309a11..1fbeab0a80dd 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -114,7 +114,7 @@ public: ShowFadeInHideButton(); } - virtual ~SfxEmptySplitWin_Impl() + virtual ~SfxEmptySplitWin_Impl() override { disposeOnce(); } virtual void dispose() override { diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 9ba17a57b8c1..2519c8ae9f85 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -88,7 +88,7 @@ public: StyleLBoxString(const OUString& sText, const SfxStyleFamily& eStyleFamily); - virtual ~StyleLBoxString(); + virtual ~StyleLBoxString() override; virtual void Paint(const Point& aPos, SvTreeListBox& rDevice, |