summaryrefslogtreecommitdiff
path: root/include/svl/style.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /include/svl/style.hxx
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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/svl/style.hxx')
-rw-r--r--include/svl/style.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index ddff30a67a31..794322da11b2 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -93,7 +93,7 @@ protected:
SfxStyleSheetBase( const OUString&, SfxStyleSheetBasePool*, SfxStyleFamily eFam, sal_uInt16 mask );
SfxStyleSheetBase( const SfxStyleSheetBase& );
- virtual ~SfxStyleSheetBase();
+ virtual ~SfxStyleSheetBase() override;
virtual void Load( SvStream&, sal_uInt16 );
void Store( SvStream& );
@@ -203,7 +203,7 @@ protected:
virtual SfxStyleSheetBase* Create( const OUString&, SfxStyleFamily, sal_uInt16 );
virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& );
- virtual ~SfxStyleSheetBasePool();
+ virtual ~SfxStyleSheetBasePool() override;
void StoreStyleSheet(const rtl::Reference< SfxStyleSheetBase >&);
@@ -279,7 +279,7 @@ protected:
{
assert(false);
}
- virtual ~SfxStyleSheet();
+ virtual ~SfxStyleSheet() override;
};