diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-01 08:40:47 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-01 11:06:26 +0200 |
commit | 612b489d3e05b24c1b6690082e8518bac033e9d2 (patch) | |
tree | 23a6c556989071385d1c64730ed72bdbae7c239c /oox/source/ppt | |
parent | 17e14d459dea201b57be2d8e677fa776ead03291 (diff) |
loplugin:checkunusedparams
the "check for taking address of function" part was generating false+
Change-Id: Iad6203850901229b7b1b2f8938c68ec703cd343f
Reviewed-on: https://gerrit.libreoffice.org/40613
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox/source/ppt')
-rw-r--r-- | oox/source/ppt/commonbehaviorcontext.cxx | 3 | ||||
-rw-r--r-- | oox/source/ppt/commonbehaviorcontext.hxx | 1 | ||||
-rw-r--r-- | oox/source/ppt/commontimenodecontext.cxx | 6 | ||||
-rw-r--r-- | oox/source/ppt/conditioncontext.cxx | 5 | ||||
-rw-r--r-- | oox/source/ppt/conditioncontext.hxx | 1 | ||||
-rw-r--r-- | oox/source/ppt/timeanimvaluecontext.cxx | 1 | ||||
-rw-r--r-- | oox/source/ppt/timeanimvaluecontext.hxx | 1 | ||||
-rw-r--r-- | oox/source/ppt/timenodelistcontext.cxx | 69 |
8 files changed, 38 insertions, 49 deletions
diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx index 9751e7b97997..4c30b5ece3d8 100644 --- a/oox/source/ppt/commonbehaviorcontext.cxx +++ b/oox/source/ppt/commonbehaviorcontext.cxx @@ -40,9 +40,8 @@ using namespace ::com::sun::star::xml::sax; namespace oox { namespace ppt { CommonBehaviorContext::CommonBehaviorContext( FragmentHandler2 const & rParent, - const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) - : TimeNodeContext( rParent, PPT_TOKEN( cBhvr ), xAttribs, pNode ) + : TimeNodeContext( rParent, PPT_TOKEN( cBhvr ), pNode ) , mbInAttrList( false ) , mbIsInAttrName( false ) { diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx index e36f746db309..0cf0a1c5089a 100644 --- a/oox/source/ppt/commonbehaviorcontext.hxx +++ b/oox/source/ppt/commonbehaviorcontext.hxx @@ -40,7 +40,6 @@ namespace oox { namespace ppt { { public: CommonBehaviorContext( ::oox::core::FragmentHandler2 const & rParent, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ); virtual ~CommonBehaviorContext( ) throw( ) override; diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx index 038e1226cf41..52495b027cda 100644 --- a/oox/source/ppt/commontimenodecontext.cxx +++ b/oox/source/ppt/commontimenodecontext.cxx @@ -356,7 +356,7 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) , mbIterate( false ) { AttributeList attribs( xAttribs ); @@ -607,9 +607,9 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I return new TimeNodeListContext( *this, mpNode->getChildren() ); case PPT_TOKEN( stCondLst ): - return new CondListContext( *this, aElementToken, rAttribs.getFastAttributeList(), mpNode, mpNode->getStartCondition() ); + return new CondListContext( *this, aElementToken, mpNode, mpNode->getStartCondition() ); case PPT_TOKEN( endCondLst ): - return new CondListContext( *this, aElementToken, rAttribs.getFastAttributeList(), mpNode, mpNode->getEndCondition() ); + return new CondListContext( *this, aElementToken, mpNode, mpNode->getEndCondition() ); case PPT_TOKEN( endSync ): return new CondContext( *this, rAttribs.getFastAttributeList(), mpNode, mpNode->getEndSyncValue() ); diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx index 591cfa75b32e..2b6aca2c42a3 100644 --- a/oox/source/ppt/conditioncontext.cxx +++ b/oox/source/ppt/conditioncontext.cxx @@ -42,7 +42,7 @@ namespace oox { namespace ppt { CondContext::CondContext( FragmentHandler2 const & rParent, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode, AnimationCondition & aValue ) - : TimeNodeContext( rParent, PPT_TOKEN( cond ), xAttribs, pNode ) + : TimeNodeContext( rParent, PPT_TOKEN( cond ), pNode ) , maCond( aValue ) { maEvent.Trigger = EventTrigger::NONE; @@ -154,10 +154,9 @@ namespace oox { namespace ppt { /** CT_TLTimeConditionList */ CondListContext::CondListContext( FragmentHandler2 const & rParent, sal_Int32 aElement, - const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode, AnimationConditionList & aCond ) - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) , maConditions( aCond ) { } diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx index b9bb2cb0c961..76399f792941 100644 --- a/oox/source/ppt/conditioncontext.hxx +++ b/oox/source/ppt/conditioncontext.hxx @@ -52,7 +52,6 @@ namespace oox { namespace ppt { public: CondListContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode, AnimationConditionList & aCondList ); virtual ~CondListContext( ) throw( ) override; diff --git a/oox/source/ppt/timeanimvaluecontext.cxx b/oox/source/ppt/timeanimvaluecontext.cxx index dccd2c381235..cf020ca62b4a 100644 --- a/oox/source/ppt/timeanimvaluecontext.cxx +++ b/oox/source/ppt/timeanimvaluecontext.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star::xml::sax; namespace oox { namespace ppt { TimeAnimValueListContext::TimeAnimValueListContext( FragmentHandler2 const & rParent, - const Reference< XFastAttributeList >& /*xAttribs*/, TimeAnimationValueList & aTavList ) : FragmentHandler2( rParent ) , maTavList( aTavList ) diff --git a/oox/source/ppt/timeanimvaluecontext.hxx b/oox/source/ppt/timeanimvaluecontext.hxx index 059564b44958..d0965edbe595 100644 --- a/oox/source/ppt/timeanimvaluecontext.hxx +++ b/oox/source/ppt/timeanimvaluecontext.hxx @@ -31,7 +31,6 @@ namespace oox { namespace ppt { { public: TimeAnimValueListContext( ::oox::core::FragmentHandler2 const & rParent, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, TimeAnimationValueList & aTavList ); virtual ~TimeAnimValueListContext( ) override; diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 3421b4abc475..47e56fe38ebf 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -108,7 +108,7 @@ namespace oox { namespace ppt { MediaNodeContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) , mbIsNarration( false ) , mbFullScrn( false ) { @@ -140,12 +140,12 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& /*rAttribs*/ ) override { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); default: break; } @@ -165,9 +165,8 @@ namespace oox { namespace ppt { { public: SetTimeNodeContext( FragmentHandler2 const & rParent, sal_Int32 aElement, - const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) { } @@ -190,12 +189,12 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& /*rAttribs*/ ) override { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); case PPT_TOKEN( to ): // CT_TLAnimVariant return new AnimVariantContext( *this, aElementToken, maTo ); @@ -218,7 +217,7 @@ namespace oox { namespace ppt { CmdTimeNodeContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) , maType(0) { switch ( aElement ) @@ -304,12 +303,12 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& /*rAttribs*/ ) override { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); default: break; } @@ -331,7 +330,7 @@ namespace oox { namespace ppt { SequenceTimeNodeContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) , mnNextAc(0) , mnPrevAc(0) { @@ -348,11 +347,9 @@ namespace oox { namespace ppt { case PPT_TOKEN( cTn ): return new CommonTimeNodeContext( *this, aElementToken, rAttribs.getFastAttributeList(), mpNode ); case PPT_TOKEN( nextCondLst ): - return new CondListContext( *this, aElementToken, rAttribs.getFastAttributeList(), mpNode, - mpNode->getNextCondition() ); + return new CondListContext( *this, aElementToken, mpNode, mpNode->getNextCondition() ); case PPT_TOKEN( prevCondLst ): - return new CondListContext( *this, aElementToken, rAttribs.getFastAttributeList(), mpNode, - mpNode->getPrevCondition() ); + return new CondListContext( *this, aElementToken, mpNode, mpNode->getPrevCondition() ); default: break; } @@ -372,9 +369,8 @@ namespace oox { namespace ppt { { public: ParallelExclTimeNodeContext( FragmentHandler2 const & rParent, sal_Int32 aElement, - const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) { } @@ -403,7 +399,7 @@ namespace oox { namespace ppt { AnimColorContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw() - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) , mnColorSpace( xAttribs->getOptionalValueToken( XML_clrSpc, 0 ) ) , mnDir( xAttribs->getOptionalValueToken( XML_dir, 0 ) ) , mbHasByColor( false ) @@ -462,7 +458,7 @@ namespace oox { namespace ppt { mbHasByColor = true; return this; case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); case PPT_TOKEN( to ): // CT_Color return new ColorContext( *this, maToClr ); @@ -494,7 +490,7 @@ namespace oox { namespace ppt { AnimContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw() - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) { NodePropertyMap & aProps( pNode->getNodeProperties() ); sal_Int32 nCalcMode = xAttribs->getOptionalValueToken( XML_calcmode, 0 ); @@ -571,14 +567,14 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& /*rAttribs*/ ) override { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); case PPT_TOKEN( tavLst ): - return new TimeAnimValueListContext ( *this, rAttribs.getFastAttributeList(), maTavList ); + return new TimeAnimValueListContext ( *this, maTavList ); default: break; } @@ -598,7 +594,7 @@ namespace oox { namespace ppt { AnimScaleContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw() - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) , mbZoomContents( false ) { AttributeList attribs( xAttribs ); @@ -632,7 +628,7 @@ namespace oox { namespace ppt { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); case PPT_TOKEN( to ): { // CT_TLPoint @@ -678,7 +674,7 @@ namespace oox { namespace ppt { AnimRotContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw() - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) { AttributeList attribs( xAttribs ); @@ -703,12 +699,12 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& /*rAttribs*/ ) override { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); default: break; } @@ -725,7 +721,7 @@ namespace oox { namespace ppt { AnimMotionContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw() - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) { pNode->getNodeProperties()[ NP_TRANSFORMTYPE ] <<= (sal_Int16)AnimationTransformType::TRANSLATE; @@ -761,7 +757,7 @@ namespace oox { namespace ppt { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); case PPT_TOKEN( to ): { // CT_TLPoint @@ -820,7 +816,7 @@ namespace oox { namespace ppt { AnimEffectContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw() - : TimeNodeContext( rParent, aElement, xAttribs, pNode ) + : TimeNodeContext( rParent, aElement, pNode ) { sal_Int32 nDir = xAttribs->getOptionalValueToken( XML_transition, 0 ); OUString sFilter = xAttribs->getOptionalValue( XML_filter ); @@ -835,12 +831,12 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& /*rAttribs*/ ) override { switch ( aElementToken ) { case PPT_TOKEN( cBhvr ): - return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); + return new CommonBehaviorContext ( *this, mpNode ); case PPT_TOKEN( progress ): return new AnimVariantContext( *this, aElementToken, maProgress ); // TODO handle it. @@ -866,13 +862,13 @@ namespace oox { namespace ppt { pCtx = new AnimColorContext( rParent, aElement, xAttribs, pNode ); break; case PPT_TOKEN( par ): - pCtx = new ParallelExclTimeNodeContext( rParent, aElement, xAttribs, pNode ); + pCtx = new ParallelExclTimeNodeContext( rParent, aElement, pNode ); break; case PPT_TOKEN( seq ): pCtx = new SequenceTimeNodeContext( rParent, aElement, xAttribs, pNode ); break; case PPT_TOKEN( excl ): - pCtx = new ParallelExclTimeNodeContext( rParent, aElement, xAttribs, pNode ); + pCtx = new ParallelExclTimeNodeContext( rParent, aElement, pNode ); break; case PPT_TOKEN( anim ): pCtx = new AnimContext ( rParent, aElement, xAttribs, pNode ); @@ -893,7 +889,7 @@ namespace oox { namespace ppt { pCtx = new CmdTimeNodeContext( rParent, aElement, xAttribs, pNode ); break; case PPT_TOKEN( set ): - pCtx = new SetTimeNodeContext( rParent, aElement, xAttribs, pNode ); + pCtx = new SetTimeNodeContext( rParent, aElement, pNode ); break; case PPT_TOKEN( audio ): case PPT_TOKEN( video ): @@ -906,7 +902,6 @@ namespace oox { namespace ppt { } TimeNodeContext::TimeNodeContext( FragmentHandler2 const & rParent, sal_Int32 aElement, - const Reference< XFastAttributeList >& /*xAttribs*/, const TimeNodePtr & pNode ) throw() : FragmentHandler2( rParent ) , mnElement( aElement ) |