summaryrefslogtreecommitdiff
path: root/sd/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-01 19:18:35 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-01 19:22:54 +0200
commit362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch)
tree0b432c049d580dcac6130bca9fb028bab8af8fa8 /sd/inc
parentb66d87086804460c1986df1b832fd6b2ea075a90 (diff)
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked "override," but at least some MSVC versions complain about it, so at least make sure such destructors are explicitly marked "virtual." Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'sd/inc')
-rw-r--r--sd/inc/CustomAnimationEffect.hxx2
-rw-r--r--sd/inc/drawdoc.hxx2
-rw-r--r--sd/inc/sdpage.hxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index fd7d5c69afc2..324d3a0647cc 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -390,7 +390,7 @@ class MainSequence : public EffectSequenceHelper, public ISequenceListener
public:
MainSequence();
MainSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTimingRootNode );
- ~MainSequence();
+ virtual ~MainSequence();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRootNode() SAL_OVERRIDE;
void reset( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTimingRootNode );
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index f6311628a69b..038ad6d83480 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -211,7 +211,7 @@ public:
TYPEINFO_OVERRIDE();
SdDrawDocument(DocumentType eType, SfxObjectShell* pDocSh);
- ~SdDrawDocument();
+ virtual ~SdDrawDocument();
virtual SdrModel* AllocModel() const SAL_OVERRIDE;
virtual SdrPage* AllocPage(bool bMasterPage) SAL_OVERRIDE;
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 313d8c7c9abf..80d40737c1ec 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -158,7 +158,7 @@ public:
SdPage(SdDrawDocument& rNewDoc, sal_Bool bMasterPage=sal_False);
SdPage(const SdPage& rSrcPage);
- ~SdPage();
+ virtual ~SdPage();
virtual SdrPage* Clone() const SAL_OVERRIDE;
virtual SdrPage* Clone(SdrModel* pNewModel) const SAL_OVERRIDE;