mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Werror=logical-op (GCC 6)

Browse Source 
"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
This commit is contained in:
Stephan Bergmann 2016-04-14 16:23:46 +02:00
parent 3f507037e6
commit 23622f240d
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sd/source/filter/eppt/pptexanimations.cxx
View File

@ -286,8 +286,7 @@ sal_Int16 AnimationExporter::GetFillMode( const Reference< XAnimationNode >& xNo
return nFill; return nFill;
} }
if ( ( nFill == AnimationFill::DEFAULT ) || if ( nFill == AnimationFill::DEFAULT )
( nFill == AnimationFill::INHERIT ) )
{ {
if ( nFill != AnimationFill::AUTO ) if ( nFill != AnimationFill::AUTO )
nFill = nFillDefault; nFill = nFillDefault;

6
slideshow/source/engine/animationnodes/basenode.cxx
View File

@ -355,16 +355,14 @@ void BaseNode::dispose()
sal_Int16 BaseNode::getRestartMode() sal_Int16 BaseNode::getRestartMode()
{ {
const sal_Int16 nTmp( mxAnimationNode->getRestart() ); const sal_Int16 nTmp( mxAnimationNode->getRestart() );
return (nTmp != animations::AnimationRestart::DEFAULT && return nTmp != animations::AnimationRestart::DEFAULT
nTmp != animations::AnimationRestart::INHERIT)
? nTmp : getRestartDefaultMode(); ? nTmp : getRestartDefaultMode();
} }
sal_Int16 BaseNode::getFillMode() sal_Int16 BaseNode::getFillMode()
{ {
const sal_Int16 nTmp( mxAnimationNode->getFill() ); const sal_Int16 nTmp( mxAnimationNode->getFill() );
const sal_Int16 nFill((nTmp != animations::AnimationFill::DEFAULT && const sal_Int16 nFill(nTmp != animations::AnimationFill::DEFAULT
nTmp != animations::AnimationFill::INHERIT)
? nTmp : getFillDefaultMode()); ? nTmp : getFillDefaultMode());
// For AUTO fill mode, SMIL specifies that fill mode is FREEZE, // For AUTO fill mode, SMIL specifies that fill mode is FREEZE,