summaryrefslogtreecommitdiff
path: root/sw/inc/unoframe.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/unoframe.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/unoframe.hxx')
-rw-r--r--sw/inc/unoframe.hxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 56df9dfee0e6..27e8dc01ef46 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -76,7 +76,7 @@ protected:
css::uno::Reference< css::container::XNameAccess > mxStyleFamily;
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
- virtual ~SwXFrame();
+ virtual ~SwXFrame() override;
SwXFrame(FlyCntType eSet,
const SfxItemPropertySet* pPropSet,
@@ -178,7 +178,7 @@ protected:
CreateCursor()
throw (css::uno::RuntimeException) override;
- virtual ~SwXTextFrame();
+ virtual ~SwXTextFrame() override;
SwXTextFrame(SwDoc *pDoc);
SwXTextFrame(SwFrameFormat& rFormat);
@@ -249,7 +249,7 @@ class SwXTextGraphicObject : public SwXTextGraphicObjectBaseClass
protected:
friend class SwXFrame; // just for CreateXFrame
- virtual ~SwXTextGraphicObject();
+ virtual ~SwXTextGraphicObject() override;
SwXTextGraphicObject( SwDoc *pDoc );
SwXTextGraphicObject(SwFrameFormat& rFormat);
@@ -284,7 +284,7 @@ class SwXTextEmbeddedObject : public SwXTextEmbeddedObjectBaseClass
protected:
friend class SwXFrame; // just for CreateXFrame
- virtual ~SwXTextEmbeddedObject();
+ virtual ~SwXTextEmbeddedObject() override;
SwXTextEmbeddedObject( SwDoc *pDoc );
SwXTextEmbeddedObject(SwFrameFormat& rFormat);
@@ -323,7 +323,7 @@ class SwXOLEListener : public cppu::WeakImplHelper
SwFormat* GetFormat() const { return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); }
public:
SwXOLEListener(SwFormat& rOLEFormat, css::uno::Reference< css::frame::XModel > const & xOLE);
- virtual ~SwXOLEListener();
+ virtual ~SwXOLEListener() override;
// css::lang::XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;