summaryrefslogtreecommitdiff
path: root/sw/inc/unostyle.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 /sw/inc/unostyle.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 'sw/inc/unostyle.hxx')
-rw-r--r--sw/inc/unostyle.hxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 57e7b5fe8765..7ce92cc73979 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -67,7 +67,7 @@ class SwXStyleFamilies : public cppu::WeakImplHelper
std::map<SfxStyleFamily, css::uno::Reference<css::container::XNameContainer>> m_vFamilies;
protected:
- virtual ~SwXStyleFamilies();
+ virtual ~SwXStyleFamilies() override;
public:
SwXStyleFamilies(SwDocShell& rDocShell);
@@ -130,7 +130,7 @@ class SwXAutoStyles :
css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoCharStyles;
css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoRubyStyles;
css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoParaStyles;
- virtual ~SwXAutoStyles();
+ virtual ~SwXAutoStyles() override;
public:
SwXAutoStyles(SwDocShell& rDocShell);
@@ -162,7 +162,7 @@ protected:
public:
SwXAutoStyleFamily(SwDocShell* pDocShell, IStyleAccess::SwAutoStyleFamily eFamily);
- virtual ~SwXAutoStyleFamily();
+ virtual ~SwXAutoStyleFamily() override;
//XAutoStyleFamily
virtual css::uno::Reference< css::style::XAutoStyle > SAL_CALL insertStyle( const css::uno::Sequence< css::beans::PropertyValue >& Values ) throw (css::uno::RuntimeException, std::exception) override;
@@ -182,7 +182,7 @@ class SwXAutoStylesEnumerator : public cppu::WeakImplHelper< css::container::XEn
SwAutoStylesEnumImpl *m_pImpl;
public:
SwXAutoStylesEnumerator( SwDoc* pDoc, IStyleAccess::SwAutoStyleFamily eFam );
- virtual ~SwXAutoStylesEnumerator();
+ virtual ~SwXAutoStylesEnumerator() override;
//XEnumeration
virtual sal_Bool SAL_CALL hasMoreElements( ) throw (css::uno::RuntimeException, std::exception) override;
@@ -210,7 +210,7 @@ private:
public:
SwXAutoStyle( SwDoc* pDoc, std::shared_ptr<SfxItemSet> const & pInitSet, IStyleAccess::SwAutoStyleFamily eFam );
- virtual ~SwXAutoStyle();
+ virtual ~SwXAutoStyle() override;
//XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override;