diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-14 16:23:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-14 17:32:17 +0200 |
| commit | 23622f240d3bed55fc89a3e78e88b10758bd5b4b (patch) | |
| tree | e5eba1537d84ef069e72cf41df7bab600e64cd15 | |
| parent | 3f507037e64994f18d661ce4f3cc06a7cd1c818c (diff) | |
-Werror=logical-op (GCC 6)
"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
| -rw-r--r-- | sd/source/filter/eppt/pptexanimations.cxx | 3 | ||||
| -rw-r--r-- | 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, |