Author: wangzcdl
Date: Mon Jun 25 06:04:59 2012
New Revision: 1353393
URL: http://svn.apache.org/viewvc?rev=1353393&view=rev
Log:
for #120049#
Modified:
incubator/ooo/trunk/main/sd/source/ui/animations/CustomAnimationDialog.cxx
Modified:
incubator/ooo/trunk/main/sd/source/ui/animations/CustomAnimationDialog.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/ui/animations/CustomAnimationDialog.cxx?rev=1353393&r1=1353392&r2=1353393&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/ui/animations/CustomAnimationDialog.cxx
(original)
+++ incubator/ooo/trunk/main/sd/source/ui/animations/CustomAnimationDialog.cxx
Mon Jun 25 06:04:59 2012
@@ -2387,15 +2387,20 @@ void CustomAnimationTextAnimTabPage::upd
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()
