diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:18:35 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:22:54 +0200 |
commit | 362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch) | |
tree | 0b432c049d580dcac6130bca9fb028bab8af8fa8 /oox/source/ppt | |
parent | b66d87086804460c1986df1b832fd6b2ea075a90 (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 'oox/source/ppt')
-rw-r--r-- | oox/source/ppt/animvariantcontext.hxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/buildlistcontext.hxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/commonbehaviorcontext.hxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/commontimenodecontext.hxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/conditioncontext.hxx | 4 | ||||
-rw-r--r-- | oox/source/ppt/customshowlistcontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/headerfootercontext.hxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/timeanimvaluecontext.hxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/timenodelistcontext.cxx | 18 | ||||
-rw-r--r-- | oox/source/ppt/timetargetelementcontext.hxx | 2 |
10 files changed, 19 insertions, 19 deletions
diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx index 714eb9ede7eb..f05d6e743597 100644 --- a/oox/source/ppt/animvariantcontext.hxx +++ b/oox/source/ppt/animvariantcontext.hxx @@ -33,7 +33,7 @@ namespace oox { namespace ppt { { public: AnimVariantContext( ::oox::core::FragmentHandler2& rParent, ::sal_Int32 aElement, ::com::sun::star::uno::Any & aValue ); - ~AnimVariantContext( ) throw( ); + virtual ~AnimVariantContext( ) throw( ); virtual void onEndElement() SAL_OVERRIDE; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; diff --git a/oox/source/ppt/buildlistcontext.hxx b/oox/source/ppt/buildlistcontext.hxx index 84a040a4f892..4bc1aa31624f 100644 --- a/oox/source/ppt/buildlistcontext.hxx +++ b/oox/source/ppt/buildlistcontext.hxx @@ -32,7 +32,7 @@ namespace oox { namespace ppt { public: BuildListContext( ::oox::core::FragmentHandler2& rParent ); - ~BuildListContext( ); + virtual ~BuildListContext( ); virtual void onEndElement() SAL_OVERRIDE; diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx index d1b58e56ed87..fe989d437a1d 100644 --- a/oox/source/ppt/commonbehaviorcontext.hxx +++ b/oox/source/ppt/commonbehaviorcontext.hxx @@ -43,7 +43,7 @@ namespace oox { namespace ppt { CommonBehaviorContext( ::oox::core::FragmentHandler2& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ); - ~CommonBehaviorContext( ) + virtual ~CommonBehaviorContext( ) throw( ); virtual void onEndElement() SAL_OVERRIDE; diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx index 21699447daf4..69c7dd7ec1d2 100644 --- a/oox/source/ppt/commontimenodecontext.hxx +++ b/oox/source/ppt/commontimenodecontext.hxx @@ -33,7 +33,7 @@ namespace oox { namespace ppt { { public: CommonTimeNodeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32 aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode); - ~CommonTimeNodeContext( ) throw( ); + virtual ~CommonTimeNodeContext( ) throw( ); virtual void onEndElement() SAL_OVERRIDE; diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx index a55f0c98518a..4eac421d68de 100644 --- a/oox/source/ppt/conditioncontext.hxx +++ b/oox/source/ppt/conditioncontext.hxx @@ -39,7 +39,7 @@ namespace oox { namespace ppt { CondContext( ::oox::core::FragmentHandler2& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode, AnimationCondition & aCond ); - ~CondContext( ) throw( ); + virtual ~CondContext( ) throw( ); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: @@ -58,7 +58,7 @@ namespace oox { namespace ppt { sal_Int32 aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode, AnimationConditionList & aCondList ); - ~CondListContext( ) throw( ); + virtual ~CondListContext( ) throw( ); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx index b616ecae6139..7cd404937742 100644 --- a/oox/source/ppt/customshowlistcontext.cxx +++ b/oox/source/ppt/customshowlistcontext.cxx @@ -33,7 +33,7 @@ public: CustomShowContext( ::oox::core::FragmentHandler2& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, CustomShow& rCustomShow ); - ~CustomShowContext( ); + virtual ~CustomShowContext( ); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; }; diff --git a/oox/source/ppt/headerfootercontext.hxx b/oox/source/ppt/headerfootercontext.hxx index c9fc6eb80702..23deb25c0220 100644 --- a/oox/source/ppt/headerfootercontext.hxx +++ b/oox/source/ppt/headerfootercontext.hxx @@ -34,7 +34,7 @@ namespace oox { namespace ppt { HeaderFooterContext( ::oox::core::FragmentHandler2& rParent, const AttributeList& rAttribs, HeaderFooter& rHeaderFooter ); - ~HeaderFooterContext( ); + virtual ~HeaderFooterContext( ); }; } } diff --git a/oox/source/ppt/timeanimvaluecontext.hxx b/oox/source/ppt/timeanimvaluecontext.hxx index c948ebedc8b6..0121403491e5 100644 --- a/oox/source/ppt/timeanimvaluecontext.hxx +++ b/oox/source/ppt/timeanimvaluecontext.hxx @@ -34,7 +34,7 @@ namespace oox { namespace ppt { const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, TimeAnimationValueList & aTavList ); - ~TimeAnimValueListContext( ); + virtual ~TimeAnimValueListContext( ); virtual void onEndElement() SAL_OVERRIDE; diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index f25c7edd7cb9..7955db8e5ec5 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -179,7 +179,7 @@ namespace oox { namespace ppt { } - ~SetTimeNodeContext() throw () + virtual ~SetTimeNodeContext() throw () { if( maTo.hasValue() ) { @@ -240,7 +240,7 @@ namespace oox { namespace ppt { } } - ~CmdTimeNodeContext() throw () + virtual ~CmdTimeNodeContext() throw () { } @@ -355,7 +355,7 @@ namespace oox { namespace ppt { mnPrevAc = xAttribs->getOptionalValueToken( XML_prevAc, 0 ); } - ~SequenceTimeNodeContext() throw() + virtual ~SequenceTimeNodeContext() throw() { } @@ -431,7 +431,7 @@ namespace oox { namespace ppt { , m_byColor( AnimationColorSpace::RGB, 0, 0, 0) { } - ~AnimColorContext() throw() + virtual ~AnimColorContext() throw() { } @@ -564,7 +564,7 @@ namespace oox { namespace ppt { } - ~AnimContext() throw () + virtual ~AnimContext() throw () { ::std::list< TimeAnimationValue >::iterator iter, end; int nKeyTimes = maTavList.size(); @@ -638,7 +638,7 @@ namespace oox { namespace ppt { = makeAny((sal_Int16)AnimationTransformType::SCALE); } - ~AnimScaleContext( ) throw( ) + virtual ~AnimScaleContext( ) throw( ) { } @@ -738,7 +738,7 @@ namespace oox { namespace ppt { } } - ~AnimRotContext( ) throw( ) + virtual ~AnimRotContext( ) throw( ) { } @@ -797,7 +797,7 @@ namespace oox { namespace ppt { // TODO make sure the units are right. Likely not. } - ~AnimMotionContext( ) throw() + virtual ~AnimMotionContext( ) throw() { } @@ -883,7 +883,7 @@ namespace oox { namespace ppt { } - ~AnimEffectContext( ) throw() + virtual ~AnimEffectContext( ) throw() { } diff --git a/oox/source/ppt/timetargetelementcontext.hxx b/oox/source/ppt/timetargetelementcontext.hxx index 0ea1f3231aaf..5e4b8079f5bb 100644 --- a/oox/source/ppt/timetargetelementcontext.hxx +++ b/oox/source/ppt/timetargetelementcontext.hxx @@ -31,7 +31,7 @@ namespace oox { namespace ppt { { public: TimeTargetElementContext( ::oox::core::FragmentHandler2& rParent, const AnimTargetElementPtr & aValue ); - ~TimeTargetElementContext( ) throw( ); + virtual ~TimeTargetElementContext( ) throw( ); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: |