diff options
Diffstat (limited to 'oox/source/ppt')
-rw-r--r-- | oox/source/ppt/animvariantcontext.hxx | 4 | ||||
-rw-r--r-- | oox/source/ppt/buildlistcontext.hxx | 4 | ||||
-rw-r--r-- | oox/source/ppt/commonbehaviorcontext.hxx | 6 | ||||
-rw-r--r-- | oox/source/ppt/commontimenodecontext.hxx | 4 | ||||
-rw-r--r-- | oox/source/ppt/conditioncontext.hxx | 4 | ||||
-rw-r--r-- | oox/source/ppt/customshowlistcontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/pptimport.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/timeanimvaluecontext.hxx | 4 | ||||
-rw-r--r-- | oox/source/ppt/timenodelistcontext.cxx | 30 | ||||
-rw-r--r-- | oox/source/ppt/timetargetelementcontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/timetargetelementcontext.hxx | 2 |
11 files changed, 32 insertions, 32 deletions
diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx index 7affdf9d6478..714eb9ede7eb 100644 --- a/oox/source/ppt/animvariantcontext.hxx +++ b/oox/source/ppt/animvariantcontext.hxx @@ -34,8 +34,8 @@ namespace oox { namespace ppt { public: AnimVariantContext( ::oox::core::FragmentHandler2& rParent, ::sal_Int32 aElement, ::com::sun::star::uno::Any & aValue ); ~AnimVariantContext( ) throw( ); - virtual void onEndElement(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual void onEndElement() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: ::sal_Int32 mnElement; diff --git a/oox/source/ppt/buildlistcontext.hxx b/oox/source/ppt/buildlistcontext.hxx index 1ee2d9a9c9b9..84a040a4f892 100644 --- a/oox/source/ppt/buildlistcontext.hxx +++ b/oox/source/ppt/buildlistcontext.hxx @@ -34,9 +34,9 @@ namespace oox { namespace ppt { ~BuildListContext( ); - virtual void onEndElement(); + virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: bool mbInBldGraphic; bool mbBuildAsOne; diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx index cbfaf7f90046..d1b58e56ed87 100644 --- a/oox/source/ppt/commonbehaviorcontext.hxx +++ b/oox/source/ppt/commonbehaviorcontext.hxx @@ -46,11 +46,11 @@ namespace oox { namespace ppt { ~CommonBehaviorContext( ) throw( ); - virtual void onEndElement(); + virtual void onEndElement() SAL_OVERRIDE; - virtual void onCharacters( const OUString& aChars ); + virtual void onCharacters( const OUString& aChars ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: bool mbInAttrList; diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx index d72d0a2cd3f6..21699447daf4 100644 --- a/oox/source/ppt/commontimenodecontext.hxx +++ b/oox/source/ppt/commontimenodecontext.hxx @@ -35,9 +35,9 @@ namespace oox { namespace ppt { 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 void onEndElement(); + virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: bool mbIterate; diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx index 710869a275d3..a55f0c98518a 100644 --- a/oox/source/ppt/conditioncontext.hxx +++ b/oox/source/ppt/conditioncontext.hxx @@ -40,7 +40,7 @@ namespace oox { namespace ppt { const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode, AnimationCondition & aCond ); ~CondContext( ) throw( ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: ::com::sun::star::animations::Event maEvent; @@ -60,7 +60,7 @@ namespace oox { namespace ppt { const TimeNodePtr & pNode, AnimationConditionList & aCondList ); ~CondListContext( ) throw( ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: AnimationConditionList & maConditions; diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx index 70ecf0cfa953..b616ecae6139 100644 --- a/oox/source/ppt/customshowlistcontext.cxx +++ b/oox/source/ppt/customshowlistcontext.cxx @@ -34,7 +34,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, CustomShow& rCustomShow ); ~CustomShowContext( ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; }; CustomShowContext::CustomShowContext( FragmentHandler2& rParent, diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index 4be3d26e49a3..7f32e6e95fe4 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -187,7 +187,7 @@ class PptGraphicHelper : public GraphicHelper { public: explicit PptGraphicHelper( const PowerPointImport& rFilter ); - virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const; + virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const SAL_OVERRIDE; private: const PowerPointImport& mrFilter; }; diff --git a/oox/source/ppt/timeanimvaluecontext.hxx b/oox/source/ppt/timeanimvaluecontext.hxx index c74d2fbc43c5..c948ebedc8b6 100644 --- a/oox/source/ppt/timeanimvaluecontext.hxx +++ b/oox/source/ppt/timeanimvaluecontext.hxx @@ -36,9 +36,9 @@ namespace oox { namespace ppt { ~TimeAnimValueListContext( ); - virtual void onEndElement(); + virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: TimeAnimationValueList & maTavList; diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index aaeacb8b3edb..f25c7edd7cb9 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -133,7 +133,7 @@ namespace oox { namespace ppt { } } - virtual void onEndElement() + virtual void onEndElement() SAL_OVERRIDE { sal_Int32 aElement = getCurrentElement(); if( aElement == PPT_TOKEN( audio ) ) @@ -146,7 +146,7 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -198,7 +198,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -244,7 +244,7 @@ namespace oox { namespace ppt { { } - virtual void onEndElement() + virtual void onEndElement() SAL_OVERRIDE { if( isCurrentElement( PPT_TOKEN( cmd ) ) ) { @@ -317,7 +317,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -360,7 +360,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -398,7 +398,7 @@ namespace oox { namespace ppt { { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -435,7 +435,7 @@ namespace oox { namespace ppt { { } - virtual void onEndElement() + virtual void onEndElement() SAL_OVERRIDE { //xParentNode if( isCurrentElement( mnElement ) ) @@ -454,7 +454,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -600,7 +600,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -642,7 +642,7 @@ namespace oox { namespace ppt { { } - virtual void onEndElement() + virtual void onEndElement() SAL_OVERRIDE { if( isCurrentElement( mnElement ) ) { @@ -661,7 +661,7 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -742,7 +742,7 @@ namespace oox { namespace ppt { { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -802,7 +802,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -888,7 +888,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx index e8c59a8913df..719b36de207a 100644 --- a/oox/source/ppt/timetargetelementcontext.cxx +++ b/oox/source/ppt/timetargetelementcontext.cxx @@ -47,7 +47,7 @@ namespace oox { namespace ppt { , maShapeTarget(aValue) { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch( aElementToken ) { diff --git a/oox/source/ppt/timetargetelementcontext.hxx b/oox/source/ppt/timetargetelementcontext.hxx index d3e592d9c179..0ea1f3231aaf 100644 --- a/oox/source/ppt/timetargetelementcontext.hxx +++ b/oox/source/ppt/timetargetelementcontext.hxx @@ -32,7 +32,7 @@ namespace oox { namespace ppt { public: TimeTargetElementContext( ::oox::core::FragmentHandler2& rParent, const AnimTargetElementPtr & aValue ); ~TimeTargetElementContext( ) throw( ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: AnimTargetElementPtr mpTarget; |