summaryrefslogtreecommitdiff
path: root/sw/inc/unodraw.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/unodraw.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/unodraw.hxx')
-rw-r--r--sw/inc/unodraw.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 439223af6f20..64facb537236 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -44,7 +44,7 @@ class SwFmDrawPage : public SvxFmDrawPage
SdrPageView* pPageView;
public:
SwFmDrawPage( SdrPage* pPage );
- virtual ~SwFmDrawPage() throw ();
+ virtual ~SwFmDrawPage() throw () override;
const SdrMarkList& PreGroup(const css::uno::Reference< css::drawing::XShapes >& rShapes);
void PreUnGroup(const css::uno::Reference< css::drawing::XShapeGroup >& rShapeGroup);
@@ -75,7 +75,7 @@ class SwXDrawPage : public SwXDrawPageBaseClass
SwFmDrawPage* pDrawPage;
public:
SwXDrawPage(SwDoc* pDoc);
- virtual ~SwXDrawPage();
+ virtual ~SwXDrawPage() override;
//XEnumerationAccess
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override;
@@ -213,7 +213,7 @@ class SwXShape : public SwXShapeBaseClass,
css::uno::RuntimeException);
protected:
- virtual ~SwXShape();
+ virtual ~SwXShape() override;
//SwClient
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
@@ -276,7 +276,7 @@ class SwXGroupShape :
public css::drawing::XShapes
{
protected:
- virtual ~SwXGroupShape();
+ virtual ~SwXGroupShape() override;
public:
SwXGroupShape(css::uno::Reference< css::uno::XInterface > & xShape);