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 /svx/source/unogallery | |
| 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 'svx/source/unogallery')
| -rw-r--r-- | svx/source/unogallery/unogalitem.hxx | 4 | ||||
| -rw-r--r-- | svx/source/unogallery/unogaltheme.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index cff54f697438..92f57ec46753 100644 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx @@ -45,7 +45,7 @@ class GalleryItem : public ::cppu::OWeakAggObject, public: GalleryItem( ::unogallery::GalleryTheme& rTheme, const GalleryObject& rObject ); - virtual ~GalleryItem() throw(); + virtual ~GalleryItem() throw() override; bool isValid() const; @@ -102,7 +102,7 @@ class GalleryDrawingModel : public SvxUnoDrawingModel public: explicit GalleryDrawingModel( SdrModel* pDoc ) throw(); - virtual ~GalleryDrawingModel() throw(); + virtual ~GalleryDrawingModel() throw() override; UNO3_GETIMPLEMENTATION_DECL( GalleryDrawingModel ) }; diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index ca7fc3afdf73..de1ff9d5f923 100644 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx @@ -45,7 +45,7 @@ class GalleryTheme : public ::cppu::WeakImplHelper< public: explicit GalleryTheme( const OUString& rThemeName ); - virtual ~GalleryTheme(); + virtual ~GalleryTheme() override; static OUString getImplementationName_Static() throw(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); |