From 23622f240d3bed55fc89a3e78e88b10758bd5b4b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 14 Apr 2016 16:23:46 +0200 Subject: [PATCH] -Werror=logical-op (GCC 6) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "logical ‘and’ of equal expressions", as DEFAULT and INHERIT are both defined as zero in the UNOIDL css.animations.AnimationFill constant group Change-Id: I59e53fe9bf73f6eec8f7aa82a216736a79e0d47c --- sd/source/filter/eppt/pptexanimations.cxx | 3 +-- slideshow/source/engine/animationnodes/basenode.cxx | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 5d7c0e87e4ff..8dc77dbfa93d 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -286,8 +286,7 @@ sal_Int16 AnimationExporter::GetFillMode( const Reference< XAnimationNode >& xNo return nFill; } - if ( ( nFill == AnimationFill::DEFAULT ) || - ( nFill == AnimationFill::INHERIT ) ) + if ( nFill == AnimationFill::DEFAULT ) { if ( nFill != AnimationFill::AUTO ) nFill = nFillDefault; diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index f8881f45f735..9b7bae8cca47 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -355,16 +355,14 @@ void BaseNode::dispose() sal_Int16 BaseNode::getRestartMode() { const sal_Int16 nTmp( mxAnimationNode->getRestart() ); - return (nTmp != animations::AnimationRestart::DEFAULT && - nTmp != animations::AnimationRestart::INHERIT) + return nTmp != animations::AnimationRestart::DEFAULT ? nTmp : getRestartDefaultMode(); } sal_Int16 BaseNode::getFillMode() { const sal_Int16 nTmp( mxAnimationNode->getFill() ); - const sal_Int16 nFill((nTmp != animations::AnimationFill::DEFAULT && - nTmp != animations::AnimationFill::INHERIT) + const sal_Int16 nFill(nTmp != animations::AnimationFill::DEFAULT ? nTmp : getFillDefaultMode()); // For AUTO fill mode, SMIL specifies that fill mode is FREEZE,