[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sd/source

[Zhe Wang]

 sd/source/ui/animations/CustomAnimationDialog.cxx |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 7eb5815354a2ba9a02b66c61a1eb3c58c4c0e534
Author: Zhe Wang <wangz...@apache.org>
Date:   Mon Jun 25 05:04:59 2012 +0000

    for #120049#(cherry picked from commit 
9b4e6064f9598c834a9c36c39932f3e326419d44)
    
    Signed-off-by: Michael Meeks <michael.me...@suse.com>

diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx 
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 64dc36c..d356078 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -2325,15 +2325,20 @@ void CustomAnimationTextAnimTabPage::update( 
STLPropertySet* pSet )
                 pSet->setPropertyValue( nHandleTextGroupingAuto, makeAny( 
fTextGroupingAuto ) );
         }
     }
+    //bug 120049
+    //[crash] Aoo crash when modify the "Random effects" animation effect's 
trigger condition to "Start effect on click of" .
+    //If this control is disabled, we should ignore its value
+    if (maCBXAnimateForm.IsEnabled())
+    {
+        sal_Bool bAnimateForm = maCBXAnimateForm.IsChecked();
+        sal_Bool bOldAnimateForm = !bAnimateForm;
 
-    sal_Bool bAnimateForm = maCBXAnimateForm.IsChecked();
-    sal_Bool bOldAnimateForm = !bAnimateForm;
-
-    if(mpSet->getPropertyState( nHandleAnimateForm ) != 
STLPropertyState_AMBIGUOUS)
-        mpSet->getPropertyValue( nHandleAnimateForm ) >>= bOldAnimateForm;
+        if(mpSet->getPropertyState( nHandleAnimateForm ) != 
STLPropertyState_AMBIGUOUS)
+            mpSet->getPropertyValue( nHandleAnimateForm ) >>= bOldAnimateForm;
 
-    if( bAnimateForm != bOldAnimateForm )
-        pSet->setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm ) );
+        if( bAnimateForm != bOldAnimateForm )
+            pSet->setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm 
) );
+    }
 }
 
 void CustomAnimationTextAnimTabPage::updateControlStates()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits