summaryrefslogtreecommitdiff
path: root/oox/source/ppt
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /oox/source/ppt
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'oox/source/ppt')
-rw-r--r--oox/source/ppt/animvariantcontext.hxx4
-rw-r--r--oox/source/ppt/buildlistcontext.hxx4
-rw-r--r--oox/source/ppt/commonbehaviorcontext.hxx6
-rw-r--r--oox/source/ppt/commontimenodecontext.hxx4
-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/pptimport.cxx4
-rw-r--r--oox/source/ppt/timeanimvaluecontext.hxx4
-rw-r--r--oox/source/ppt/timenodelistcontext.cxx30
-rw-r--r--oox/source/ppt/timetargetelementcontext.cxx2
-rw-r--r--oox/source/ppt/timetargetelementcontext.hxx2
12 files changed, 34 insertions, 34 deletions
diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx
index f05d6e743597..70bcc0ff08b8 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 );
virtual ~AnimVariantContext( ) throw( );
- virtual void onEndElement() SAL_OVERRIDE;
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE;
+ virtual void onEndElement() override;
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
private:
::sal_Int32 mnElement;
diff --git a/oox/source/ppt/buildlistcontext.hxx b/oox/source/ppt/buildlistcontext.hxx
index a5a46bbd78a4..84ec8e97c879 100644
--- a/oox/source/ppt/buildlistcontext.hxx
+++ b/oox/source/ppt/buildlistcontext.hxx
@@ -33,9 +33,9 @@ namespace oox { namespace ppt {
virtual ~BuildListContext( );
- virtual void onEndElement() SAL_OVERRIDE;
+ virtual void onEndElement() override;
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE;
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
private:
bool mbInBldGraphic;
bool mbBuildAsOne;
diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx
index 5625f34e9cf1..a54c9cadb9a2 100644
--- a/oox/source/ppt/commonbehaviorcontext.hxx
+++ b/oox/source/ppt/commonbehaviorcontext.hxx
@@ -45,11 +45,11 @@ namespace oox { namespace ppt {
virtual ~CommonBehaviorContext( )
throw( );
- virtual void onEndElement() SAL_OVERRIDE;
+ virtual void onEndElement() override;
- virtual void onCharacters( const OUString& aChars ) SAL_OVERRIDE;
+ virtual void onCharacters( const OUString& aChars ) override;
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE;
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
private:
bool mbInAttrList;
diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx
index 6790135fc9e1..aadaee7e723a 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);
virtual ~CommonTimeNodeContext( ) throw( );
- virtual void onEndElement() SAL_OVERRIDE;
+ virtual void onEndElement() override;
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE;
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
private:
bool mbIterate;
diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx
index 612797a57a0a..a57dd1af6dc3 100644
--- a/oox/source/ppt/conditioncontext.hxx
+++ b/oox/source/ppt/conditioncontext.hxx
@@ -39,7 +39,7 @@ namespace oox { namespace ppt {
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
const TimeNodePtr & pNode, AnimationCondition & aCond );
virtual ~CondContext( ) throw( );
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE;
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
private:
::com::sun::star::animations::Event maEvent;
@@ -57,7 +57,7 @@ namespace oox { namespace ppt {
const TimeNodePtr & pNode, AnimationConditionList & aCondList );
virtual ~CondListContext( ) throw( );
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE;
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
private:
AnimationConditionList & maConditions;
diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx
index a23447740e0b..a388241a8f9a 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 );
virtual ~CustomShowContext( );
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE;
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
};
CustomShowContext::CustomShowContext( FragmentHandler2& rParent,
diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx
index fdfdc0cedc03..17c84a76a50e 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.hxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.hxx
@@ -29,7 +29,7 @@ public:
oox::drawingml::ShapePtr pShapePtr ) throw();
virtual ~ExtDrawingFragmentHandler() throw();
- virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) SAL_OVERRIDE;
+ virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) override;
private:
const oox::ppt::SlidePersistPtr mpSlidePersistPtr;
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index e755f6849c1b..46ddb48987ee 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -192,8 +192,8 @@ class PptGraphicHelper : public GraphicHelper
{
public:
explicit PptGraphicHelper( const PowerPointImport& rFilter );
- virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const SAL_OVERRIDE;
- virtual sal_Int32 getDefaultChartAreaFillStyle() const SAL_OVERRIDE;
+ virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const override;
+ virtual sal_Int32 getDefaultChartAreaFillStyle() const override;
private:
const PowerPointImport& mrFilter;
};
diff --git a/oox/source/ppt/timeanimvaluecontext.hxx b/oox/source/ppt/timeanimvaluecontext.hxx
index 0121403491e5..21d60c0e3dd9 100644
--- a/oox/source/ppt/timeanimvaluecontext.hxx
+++ b/oox/source/ppt/timeanimvaluecontext.hxx
@@ -36,9 +36,9 @@ namespace oox { namespace ppt {
virtual ~TimeAnimValueListContext( );
- virtual void onEndElement() SAL_OVERRIDE;
+ virtual void onEndElement() override;
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE;
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
private:
TimeAnimationValueList & maTavList;
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index e094d90a57d7..4efd9fedc7ee 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -132,7 +132,7 @@ namespace oox { namespace ppt {
}
}
- virtual void onEndElement() SAL_OVERRIDE
+ virtual void onEndElement() override
{
sal_Int32 aElement = getCurrentElement();
if( aElement == PPT_TOKEN( audio ) )
@@ -145,7 +145,7 @@ namespace oox { namespace ppt {
}
}
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override
{
switch ( aElementToken )
{
@@ -196,7 +196,7 @@ namespace oox { namespace ppt {
}
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override
{
switch ( aElementToken )
{
@@ -242,7 +242,7 @@ namespace oox { namespace ppt {
{
}
- virtual void onEndElement() SAL_OVERRIDE
+ virtual void onEndElement() override
{
if( isCurrentElement( PPT_TOKEN( cmd ) ) )
{
@@ -314,7 +314,7 @@ namespace oox { namespace ppt {
}
}
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override
{
switch ( aElementToken )
{
@@ -355,7 +355,7 @@ namespace oox { namespace ppt {
{
}
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override
{
switch ( aElementToken )
{
@@ -392,7 +392,7 @@ namespace oox { namespace ppt {
{
}
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override
{
switch ( aElementToken )
{
@@ -428,7 +428,7 @@ namespace oox { namespace ppt {
{
}
- virtual void onEndElement() SAL_OVERRIDE
+ virtual void onEndElement() override
{
//xParentNode
if( isCurrentElement( mnElement ) )
@@ -446,7 +446,7 @@ namespace oox { namespace ppt {
}
}
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override
{
switch ( aElementToken )
{
@@ -588,7 +588,7 @@ namespace oox { namespace ppt {
}
}
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override
{
switch ( aElementToken )
{
@@ -629,7 +629,7 @@ namespace oox { namespace ppt {
{
}
- virtual void onEndElement() SAL_OVERRIDE
+ virtual void onEndElement() override
{
if( isCurrentElement( mnElement ) )
{
@@ -648,7 +648,7 @@ namespace oox { namespace ppt {
}
}
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override
{
switch ( aElementToken )
{
@@ -728,7 +728,7 @@ namespace oox { namespace ppt {
{
}
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override
{
switch ( aElementToken )
{
@@ -785,7 +785,7 @@ namespace oox { namespace ppt {
{
}
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override
{
switch ( aElementToken )
{
@@ -868,7 +868,7 @@ namespace oox { namespace ppt {
{
}
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override
{
switch ( aElementToken )
{
diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx
index b565a1b5e917..258ba12ef68e 100644
--- a/oox/source/ppt/timetargetelementcontext.cxx
+++ b/oox/source/ppt/timetargetelementcontext.cxx
@@ -45,7 +45,7 @@ namespace oox { namespace ppt {
, maShapeTarget(aValue)
{
}
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override
{
switch( aElementToken )
{
diff --git a/oox/source/ppt/timetargetelementcontext.hxx b/oox/source/ppt/timetargetelementcontext.hxx
index 5e4b8079f5bb..f5e4a65e5517 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 );
virtual ~TimeTargetElementContext( ) throw( );
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE;
+ virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
private:
AnimTargetElementPtr mpTarget;