View | Details | Raw Unified | Return to issue 120049
Collapse All | Expand All

(-)main/sd/source/ui/animations/CustomAnimationDialog.cxx (-7 / +12 lines)
Lines 2387-2401 Link Here
2387
				pSet->setPropertyValue( nHandleTextGroupingAuto, makeAny( fTextGroupingAuto ) );
2387
				pSet->setPropertyValue( nHandleTextGroupingAuto, makeAny( fTextGroupingAuto ) );
2388
		}
2388
		}
2389
	}
2389
	}
2390
	//bug 120049
2391
	//[crash] Aoo crash when modify the "Random effects" animation effect's trigger condition to "Start effect on click of" .
2392
	//If this control is disabled, we should ignore its value
2393
	if (maCBXAnimateForm.IsEnabled())
2394
	{
2395
		sal_Bool bAnimateForm = maCBXAnimateForm.IsChecked();
2396
		sal_Bool bOldAnimateForm = !bAnimateForm;
2390
2397
2391
	sal_Bool bAnimateForm = maCBXAnimateForm.IsChecked();
2398
		if(mpSet->getPropertyState( nHandleAnimateForm ) != STLPropertyState_AMBIGUOUS)
2392
	sal_Bool bOldAnimateForm = !bAnimateForm;
2399
			mpSet->getPropertyValue( nHandleAnimateForm ) >>= bOldAnimateForm;
2393
2400
2394
	if(mpSet->getPropertyState( nHandleAnimateForm ) != STLPropertyState_AMBIGUOUS)
2401
		if( bAnimateForm != bOldAnimateForm )
2395
		mpSet->getPropertyValue( nHandleAnimateForm ) >>= bOldAnimateForm;
2402
			pSet->setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm ) );
2396
2403
	}
2397
	if( bAnimateForm != bOldAnimateForm )
2398
		pSet->setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm ) );
2399
}
2404
}
2400
2405
2401
void CustomAnimationTextAnimTabPage::updateControlStates()
2406
void CustomAnimationTextAnimTabPage::updateControlStates()

Return to issue 120049