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 /cui/source/dialogs | |
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 'cui/source/dialogs')
-rw-r--r-- | cui/source/dialogs/SpellAttrib.hxx | 6 | ||||
-rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 77f0704ba9a4..092fdc5e46d2 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -100,7 +100,7 @@ private: public: SpellErrorAttrib( const SpellErrorDescription& ); SpellErrorAttrib( const SpellErrorAttrib& rAttr ); - virtual ~SpellErrorAttrib(); + virtual ~SpellErrorAttrib() override; const SpellErrorDescription& GetErrorDescription() const { return m_aSpellErrorDescription; } @@ -120,7 +120,7 @@ class SpellLanguageAttrib : public TextAttrib public: SpellLanguageAttrib(LanguageType eLanguage); SpellLanguageAttrib( const SpellLanguageAttrib& rAttr ); - virtual ~SpellLanguageAttrib(); + virtual ~SpellLanguageAttrib() override; LanguageType GetLanguage() const {return m_eLanguage;} @@ -139,7 +139,7 @@ class SpellBackgroundAttrib : public TextAttrib public: SpellBackgroundAttrib(const Color& rCol); SpellBackgroundAttrib( const SpellBackgroundAttrib& rAttr ); - virtual ~SpellBackgroundAttrib(); + virtual ~SpellBackgroundAttrib() override; virtual void SetFont( vcl::Font& rFont ) const override; virtual TextAttrib* Clone() const override; diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index a18cafd9ee27..af15bb5878ba 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -120,7 +120,7 @@ public: m_nOffset(0) {} - virtual ~SpellUndoAction_Impl(); + virtual ~SpellUndoAction_Impl() override; virtual void Undo() override; virtual sal_uInt16 GetId() const override; diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index f7b3dbe8ef1d..bc3c5786e057 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -184,7 +184,7 @@ class ColorFieldControl : public Control { public: ColorFieldControl(vcl::Window* pParent, WinBits nStyle); - virtual ~ColorFieldControl(); + virtual ~ColorFieldControl() override; virtual void dispose() override; @@ -595,7 +595,7 @@ class ColorSliderControl : public Control { public: ColorSliderControl( vcl::Window* pParent, WinBits nStyle ); - virtual ~ColorSliderControl(); + virtual ~ColorSliderControl() override; virtual void dispose() override; virtual void MouseMove( const MouseEvent& rMEvt ) override; @@ -866,7 +866,7 @@ class ColorPickerDialog : public ModalDialog { public: ColorPickerDialog(vcl::Window* pParent, sal_Int32 nColor, sal_Int16 nMode); - virtual ~ColorPickerDialog() + virtual ~ColorPickerDialog() override { disposeOnce(); } |