summaryrefslogtreecommitdiff
path: root/oox/source/ppt
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 /oox/source/ppt
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 'oox/source/ppt')
-rw-r--r--oox/source/ppt/animvariantcontext.hxx2
-rw-r--r--oox/source/ppt/buildlistcontext.hxx2
-rw-r--r--oox/source/ppt/commonbehaviorcontext.hxx2
-rw-r--r--oox/source/ppt/commontimenodecontext.hxx2
-rw-r--r--oox/source/ppt/conditioncontext.hxx4
-rw-r--r--oox/source/ppt/customshowlistcontext.cxx2
-rw-r--r--oox/source/ppt/extdrawingfragmenthandler.hxx2
-rw-r--r--oox/source/ppt/headerfootercontext.hxx2
-rw-r--r--oox/source/ppt/timeanimvaluecontext.hxx2
-rw-r--r--oox/source/ppt/timenodelistcontext.cxx18
-rw-r--r--oox/source/ppt/timetargetelementcontext.hxx2
11 files changed, 20 insertions, 20 deletions
diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx
index 278e4255b2b2..4ab209180230 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, css::uno::Any & aValue );
- virtual ~AnimVariantContext( ) throw( );
+ virtual ~AnimVariantContext( ) throw( ) override;
virtual void onEndElement() override;
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
diff --git a/oox/source/ppt/buildlistcontext.hxx b/oox/source/ppt/buildlistcontext.hxx
index 84ec8e97c879..5fbf5f2b6618 100644
--- a/oox/source/ppt/buildlistcontext.hxx
+++ b/oox/source/ppt/buildlistcontext.hxx
@@ -31,7 +31,7 @@ namespace oox { namespace ppt {
public:
explicit BuildListContext( ::oox::core::FragmentHandler2& rParent );
- virtual ~BuildListContext( );
+ virtual ~BuildListContext( ) override;
virtual void onEndElement() override;
diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx
index dbe070118d59..4d396050a517 100644
--- a/oox/source/ppt/commonbehaviorcontext.hxx
+++ b/oox/source/ppt/commonbehaviorcontext.hxx
@@ -43,7 +43,7 @@ namespace oox { namespace ppt {
const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
const TimeNodePtr & pNode );
virtual ~CommonBehaviorContext( )
- throw( );
+ throw( ) override;
virtual void onEndElement() override;
diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx
index f5109efe2ce4..1dd2687a674b 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 css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode);
- virtual ~CommonTimeNodeContext( ) throw( );
+ virtual ~CommonTimeNodeContext( ) throw( ) override;
virtual void onEndElement() override;
diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx
index 6ec307f1fb29..726191dba526 100644
--- a/oox/source/ppt/conditioncontext.hxx
+++ b/oox/source/ppt/conditioncontext.hxx
@@ -37,7 +37,7 @@ namespace oox { namespace ppt {
CondContext( ::oox::core::FragmentHandler2& rParent,
const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
const TimeNodePtr & pNode, AnimationCondition & aCond );
- virtual ~CondContext( ) throw( );
+ virtual ~CondContext( ) throw( ) override;
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
private:
@@ -54,7 +54,7 @@ namespace oox { namespace ppt {
sal_Int32 aElement,
const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
const TimeNodePtr & pNode, AnimationConditionList & aCondList );
- virtual ~CondListContext( ) throw( );
+ virtual ~CondListContext( ) throw( ) override;
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx
index e5957c410671..e8839abb5b61 100644
--- a/oox/source/ppt/customshowlistcontext.cxx
+++ b/oox/source/ppt/customshowlistcontext.cxx
@@ -37,7 +37,7 @@ public:
CustomShowContext( ::oox::core::FragmentHandler2& rParent,
const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
CustomShow& rCustomShow );
- virtual ~CustomShowContext( );
+ virtual ~CustomShowContext( ) override;
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
};
diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx
index f8084971369f..f799a1bad158 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.hxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.hxx
@@ -26,7 +26,7 @@ public:
const oox::ppt::ShapeLocation eShapeLocation,
oox::drawingml::ShapePtr const & pGroupShapePtr,
oox::drawingml::ShapePtr const & pShapePtr ) throw();
- virtual ~ExtDrawingFragmentHandler() throw();
+ virtual ~ExtDrawingFragmentHandler() throw() override;
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) override;
diff --git a/oox/source/ppt/headerfootercontext.hxx b/oox/source/ppt/headerfootercontext.hxx
index 7be60f09fe89..89ab5b9d79a7 100644
--- a/oox/source/ppt/headerfootercontext.hxx
+++ b/oox/source/ppt/headerfootercontext.hxx
@@ -32,7 +32,7 @@ namespace oox { namespace ppt {
HeaderFooterContext( ::oox::core::FragmentHandler2& rParent,
const AttributeList& rAttribs, HeaderFooter& rHeaderFooter );
- virtual ~HeaderFooterContext( );
+ virtual ~HeaderFooterContext( ) override;
};
} }
diff --git a/oox/source/ppt/timeanimvaluecontext.hxx b/oox/source/ppt/timeanimvaluecontext.hxx
index add8fe040f84..2562393e71d7 100644
--- a/oox/source/ppt/timeanimvaluecontext.hxx
+++ b/oox/source/ppt/timeanimvaluecontext.hxx
@@ -34,7 +34,7 @@ namespace oox { namespace ppt {
const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs,
TimeAnimationValueList & aTavList );
- virtual ~TimeAnimValueListContext( );
+ virtual ~TimeAnimValueListContext( ) override;
virtual void onEndElement() override;
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 5efc6c7ed8ec..e795b6e8b129 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -179,7 +179,7 @@ namespace oox { namespace ppt {
}
- virtual ~SetTimeNodeContext() throw ()
+ virtual ~SetTimeNodeContext() throw () override
{
if( maTo.hasValue() )
{
@@ -240,7 +240,7 @@ namespace oox { namespace ppt {
}
}
- virtual ~CmdTimeNodeContext() throw ()
+ virtual ~CmdTimeNodeContext() throw () override
{
}
@@ -353,7 +353,7 @@ namespace oox { namespace ppt {
mnPrevAc = xAttribs->getOptionalValueToken( XML_prevAc, 0 );
}
- virtual ~SequenceTimeNodeContext() throw()
+ virtual ~SequenceTimeNodeContext() throw() override
{
}
@@ -426,7 +426,7 @@ namespace oox { namespace ppt {
, m_byColor( AnimationColorSpace::RGB, 0, 0, 0)
{
}
- virtual ~AnimColorContext() throw()
+ virtual ~AnimColorContext() throw() override
{
}
@@ -555,7 +555,7 @@ namespace oox { namespace ppt {
mnValueType = xAttribs->getOptionalValueToken( XML_valueType, 0 );
}
- virtual ~AnimContext() throw ()
+ virtual ~AnimContext() throw () override
{
::std::list< TimeAnimationValue >::iterator iter, end;
int nKeyTimes = maTavList.size();
@@ -627,7 +627,7 @@ namespace oox { namespace ppt {
= makeAny((sal_Int16)AnimationTransformType::SCALE);
}
- virtual ~AnimScaleContext( ) throw( )
+ virtual ~AnimScaleContext( ) throw( ) override
{
}
@@ -726,7 +726,7 @@ namespace oox { namespace ppt {
}
}
- virtual ~AnimRotContext( ) throw( )
+ virtual ~AnimRotContext( ) throw( ) override
{
}
@@ -783,7 +783,7 @@ namespace oox { namespace ppt {
// TODO make sure the units are right. Likely not.
}
- virtual ~AnimMotionContext( ) throw()
+ virtual ~AnimMotionContext( ) throw() override
{
}
@@ -866,7 +866,7 @@ namespace oox { namespace ppt {
}
}
- virtual ~AnimEffectContext( ) throw()
+ virtual ~AnimEffectContext( ) throw() override
{
}
diff --git a/oox/source/ppt/timetargetelementcontext.hxx b/oox/source/ppt/timetargetelementcontext.hxx
index f5e4a65e5517..c51a6d8207a8 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 );
- virtual ~TimeTargetElementContext( ) throw( );
+ virtual ~TimeTargetElementContext( ) throw( ) override;
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
private: