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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Jul 18 14:43:14 UTC 2018


 filter/source/svg/presentation_engine.js |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit ec640f452af7c62b2e72b84261e2162bae4cef7e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 18 13:26:42 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 18 16:42:52 2018 +0200

    Related: rhbz#1602589 dead_error_line: Execution cannot reach this statement
    
    Change-Id: If0e4ea982ede92d564aafb247c789cc6cc3013ca
    Reviewed-on: https://gerrit.libreoffice.org/57638
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js
index 152fe03e867a..7fd8eaa3d8fa 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -12170,7 +12170,6 @@ SlideTransition.prototype.createSlideTransition = function( aLeavingSlide, aEnte
 
                 case PUSHWIPE_TRANSITION:
                 {
-                    var bCombined = false;
                     var aDirection = null;
                     switch( this.eTransitionSubType )
                     {
@@ -12192,10 +12191,7 @@ SlideTransition.prototype.createSlideTransition = function( aLeavingSlide, aEnte
                             aDirection = { x: -1.0, y: 0.0 };
                             break;
                     }
-                    if( bCombined )
-                        return null;
-                    else
-                        return new MovingSlideChange( aLeavingSlide, aEnteringSlide, aDirection, aDirection );
+                    return new MovingSlideChange( aLeavingSlide, aEnteringSlide, aDirection, aDirection );
                 }
 
                 case SLIDEWIPE_TRANSITION:


More information about the Libreoffice-commits mailing list