summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2016-02-25 19:16:38 +0000
committerDavid Tardon <dtardon@redhat.com>2016-02-26 08:28:02 +0000
commit6ce8f5808d2d27ad1702559d8f7d1a94c886487a (patch)
tree0c857a8eed19d438e153a1d2cb3d5db4dfed9310
parent91c4894d49639b00e1cf8dac830fa485472cde9a (diff)
tdf#97299 - allow slide transitions to be removed.
Change-Id: I652330f6526b1ecf735ed02554e3627768b41085 Reviewed-on: https://gerrit.libreoffice.org/22703 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 2cb163cfb358..1ee64e0645bf 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() &&