summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2016-02-25 19:16:38 +0000
committerMichael Meeks <michael.meeks@collabora.com>2016-02-25 19:18:29 +0000
commitb3d08b755aae1022ad5a08d5cbd91c242535ed89 (patch)
treed9d8521d7bad970a5f6dcdfc51a70c61c745068c
parent36ae1972ff64c80dc053680c82032904f7bbdcb8 (diff)
tdf#97299 - allow slide transitions to be removed.
Change-Id: I652330f6526b1ecf735ed02554e3627768b41085
-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 90beb1b31172..051aa6404377 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() &&