Skip to content

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

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

Signed-off-by: 's avatarMichael Meeks <michael.meeks@suse.com>
üst 2e8a941f
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 @ 62696683
......@@ -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()
......
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