Skip to content

C
core
Kaydet (Commit) b86cf042 authored tarafından Zhe Wang's avatar Zhe Wang Kaydeden (comit) Xisco Fauli
Dosyalara gözat
Seçenekler

for #120049#(cherry picked from commit 9b4e6064)

üst 7ec7a9a6
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 7 deletions
sd/source/ui/animations/CustomAnimationDialog.cxx
Dosyayı görüntüle @ b86cf042
...@@ -2323,15 +2323,20 @@ void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet ) ...@@ -2323,15 +2323,20 @@ void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet )
pSet->setPropertyValue( nHandleTextGroupingAuto, makeAny( fTextGroupingAuto ) ); 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(); if(mpSet->getPropertyState( nHandleAnimateForm ) != STLPropertyState_AMBIGUOUS)
sal_Bool bOldAnimateForm = !bAnimateForm; mpSet->getPropertyValue( nHandleAnimateForm ) >>= bOldAnimateForm;
if(mpSet->getPropertyState( nHandleAnimateForm ) != STLPropertyState_AMBIGUOUS)
mpSet->getPropertyValue( nHandleAnimateForm ) >>= bOldAnimateForm;
if( bAnimateForm != bOldAnimateForm ) if( bAnimateForm != bOldAnimateForm )
pSet->setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm ) ); pSet->setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm ) );
}
} }
void CustomAnimationTextAnimTabPage::updateControlStates() void CustomAnimationTextAnimTabPage::updateControlStates()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment