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 /include/sfx2/dinfdlg.hxx | |
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 'include/sfx2/dinfdlg.hxx')
-rw-r--r-- | include/sfx2/dinfdlg.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 57a62ff90920..bb177ccc5f93 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -93,7 +93,7 @@ public: const css::uno::Sequence< css::document::CmisProperty> & i_cmisProps, bool bUseUserData, bool bUseThumbnailSave ); SfxDocumentInfoItem( const SfxDocumentInfoItem& ); - virtual ~SfxDocumentInfoItem(); + virtual ~SfxDocumentInfoItem() override; /// update i_xDocProps with the data in this object void UpdateDocumentInfo( @@ -216,7 +216,7 @@ private: void ImplCheckPasswordState(); protected: - virtual ~SfxDocumentPage(); + virtual ~SfxDocumentPage() override; virtual void dispose() override; virtual bool FillItemSet( SfxItemSet* ) override; @@ -241,7 +241,7 @@ private: SfxDocumentInfoItem* m_pInfoItem; protected: - virtual ~SfxDocumentDescPage(); + virtual ~SfxDocumentDescPage() override; virtual void dispose() override; virtual bool FillItemSet( SfxItemSet* ) override; @@ -366,7 +366,7 @@ private: public: CustomPropertiesYesNoButton( vcl::Window* pParent, const ResId& rResId ); - virtual ~CustomPropertiesYesNoButton(); + virtual ~CustomPropertiesYesNoButton() override; virtual void dispose() override; virtual void Resize() override; @@ -444,7 +444,7 @@ public: FixedText *pHeaderAccName, FixedText *pHeaderAccType, FixedText *pHeaderAccValue); - virtual ~CustomPropertiesWindow(); + virtual ~CustomPropertiesWindow() override; virtual void dispose() override; bool InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar ); @@ -480,7 +480,7 @@ private: public: CustomPropertiesControl(vcl::Window* pParent); - virtual ~CustomPropertiesControl(); + virtual ~CustomPropertiesControl() override; virtual void dispose() override; void AddLine( const OUString& sName, css::uno::Any& rAny, bool bInteractive ); @@ -506,7 +506,7 @@ private: using TabPage::DeactivatePage; protected: - virtual ~SfxCustomPropertiesPage(); + virtual ~SfxCustomPropertiesPage() override; virtual void dispose() override; virtual bool FillItemSet( SfxItemSet* ) override; @@ -559,7 +559,7 @@ struct CmisPropertyLine : public VclBuilderContainer std::vector< CmisYesNo* > m_aYesNos; long getItemHeight() const; CmisPropertyLine( vcl::Window* pParent ); - virtual ~CmisPropertyLine(); + virtual ~CmisPropertyLine() override; }; // class CmisPropertiesWindow ------------------------------------------ @@ -634,7 +634,7 @@ protected: public: SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& ); - virtual ~SfxCmisPropertiesPage(); + virtual ~SfxCmisPropertiesPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* ); |