From 362d4f0cd4e50111edfae9d30c90602c37ed65a2 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 1 Apr 2014 19:18:35 +0200 Subject: 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 --- svx/source/inc/fmundo.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'svx/source/inc/fmundo.hxx') diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index b86d758c2de6..785d122050c0 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -96,7 +96,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& xCont, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElem, sal_Int32 nIdx = -1); - ~FmUndoContainerAction(); + virtual ~FmUndoContainerAction(); virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; @@ -118,7 +118,7 @@ class FmUndoModelReplaceAction : public SdrUndoAction public: FmUndoModelReplaceAction(FmFormModel& rMod, SdrUnoObj* pObject, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xReplaced); - ~FmUndoModelReplaceAction(); + virtual ~FmUndoModelReplaceAction(); virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE { Undo(); } @@ -148,7 +148,7 @@ class SVX_DLLPRIVATE FmXUndoEnvironment public: FmXUndoEnvironment(FmFormModel& _rModel); - ~FmXUndoEnvironment(); + virtual ~FmXUndoEnvironment(); // UNO Anbindung // SMART_UNO_DECLARATION(FmXUndoEnvironment, ::cppu::OWeakObject); -- cgit