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

[Rishabh]

 sd/source/ui/animations/SlideTransitionPane.cxx |    8 ++++----
 sd/source/ui/animations/SlideTransitionPane.hxx |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5df76b2d3ddbd97bf7e6c5d78052766e1602b558
Author: Rishabh <kris.kr296 at gmail.com>
Date:   Sun Feb 21 13:06:33 2016 +0530

    tdf#98035: Changing 'Advance Slide' options shouldnt start preview
    
    Change-Id: I636ceb14a528f2523a6fd68e341c83420fa30834
    Reviewed-on: https://gerrit.libreoffice.org/22585
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 9f1e6bb..90beb1b 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 6a45746..f8b8f43 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();