[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sd/source

[Michael Meeks]

 sd/source/ui/animations/SlideTransitionPane.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6ce8f5808d2d27ad1702559d8f7d1a94c886487a
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu Feb 25 19:16:38 2016 +0000

    tdf#97299 - allow slide transitions to be removed.
    
    Change-Id: I652330f6526b1ecf735ed02554e3627768b41085
    Reviewed-on: https://gerrit.libreoffice.org/22703
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 2cb163c..1ee64e0 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -805,7 +805,9 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co
             }
         }
         aResult.mbEffectAmbiguous = false;
-    }
+
+    } else if (mpVS_TRANSITION_ICONS->IsNoSelection())
+        aResult.mbEffectAmbiguous = false;
 
     // speed
     if( mpLB_SPEED->IsEnabled() &&