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

[Michael Meeks]

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

New commits:
commit b3d08b755aae1022ad5a08d5cbd91c242535ed89
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

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 90beb1b..051aa64 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() &&