diff options
| author | Rishabh <kris.kr296@gmail.com> | 2016-02-21 13:06:33 +0530 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-02-22 10:06:34 +0000 |
| commit | 5df76b2d3ddbd97bf7e6c5d78052766e1602b558 (patch) | |
| tree | 803f3032519523fe90906faace9510835166bb90 | |
| parent | 3a34e0a2cba570f8d2728bbbf3dcb658aff6b983 (diff) | |
tdf#98035: Changing 'Advance Slide' options shouldnt start preview
Change-Id: I636ceb14a528f2523a6fd68e341c83420fa30834
Reviewed-on: https://gerrit.libreoffice.org/22585
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
| -rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 9f1e6bb13bf9..90beb1b31172 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -874,7 +874,7 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co return aResult; } -void SlideTransitionPane::applyToSelectedPages() +void SlideTransitionPane::applyToSelectedPages(bool bPreview = true) { if( ! mbUpdatingControls ) { @@ -889,7 +889,7 @@ void SlideTransitionPane::applyToSelectedPages() mrBase.GetDocShell()->SetModified(); } if( mpCB_AUTO_PREVIEW->IsEnabled() && - mpCB_AUTO_PREVIEW->IsChecked()) + mpCB_AUTO_PREVIEW->IsChecked() && bPreview) { if (aEffect.mnType) // mnType = 0 denotes no transition playCurrentEffect(); @@ -1068,12 +1068,12 @@ void SlideTransitionPane::updateVariants( size_t nPresetOffset ) IMPL_LINK_NOARG_TYPED(SlideTransitionPane, AdvanceSlideRadioButtonToggled, RadioButton&, void) { updateControlState(); - applyToSelectedPages(); + applyToSelectedPages(false); } IMPL_LINK_NOARG_TYPED(SlideTransitionPane, AdvanceTimeModified, Edit&, void) { - applyToSelectedPages(); + applyToSelectedPages(false); } IMPL_LINK_NOARG_TYPED(SlideTransitionPane, VariantListBoxSelected, ListBox&, void) diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index 6a4574632aec..f8b8f438b7ef 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -77,7 +77,7 @@ private: impl::TransitionEffect getTransitionEffectFromControls() const; - void applyToSelectedPages(); + void applyToSelectedPages(bool bPreview); void playCurrentEffect(); void stopEffects(); |