diff options
| author | Zhe Wang <wangzcdl@apache.org> | 2012-06-25 05:04:59 +0000 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-07 13:21:03 +0200 |
| commit | 626966831c5f1fa70abc9b69e3a2b2486cc3e130 (patch) | |
| tree | 04e9fa169310dd04bc628a0a4dd329756028d61e | |
| parent | 2e8a941f57292c92e15314001ed70ad31435c7aa (diff) | |
for #120049#(cherry picked from commit 9b4e6064f9598c834a9c36c39932f3e326419d44)
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 64dc36ca170e..d356078825e6 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() |