[Libreoffice-commits] core.git: sd/source

[Libreoffice Gerrit user]

 sd/source/filter/eppt/pptexanimations.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ea6537b455634f785de6482cc01a21a90bcf0ce5
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sun Nov 4 23:01:56 2018 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Mon Nov 5 08:50:06 2018 +0100

    tdf#120703 PVS: V547 Expression is always true
    
    The inner check looks suspicious. Still, I don't think that intended
    behavior was to check nFillDefault, because in that case the next
    line would likely start with "else if".
    
    The change just keeps current behavior; I make this an individual
    commit to keep the decision's context.
    
    Change-Id: I67d37aa0fee82190ce4bba5784b76c9f522b97ff
    Reviewed-on: https://gerrit.libreoffice.org/62864
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 5eabb246d498..7be6a29d4657 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -282,8 +282,7 @@ sal_Int16 AnimationExporter::GetFillMode( const Reference< XAnimationNode >& xNo
 
     if ( nFill == AnimationFill::DEFAULT )
     {
-        if ( nFill != AnimationFill::AUTO )
-            nFill = nFillDefault;
+        nFill = nFillDefault;
     }
     if( nFill == AnimationFill::AUTO )
     {