CustomAnimationDialog.cxx (79aad27f) CustomAnimationDialog.cxx (c70987f7)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 2373 unchanged lines hidden (view full) ---

2382
2383 if(mpSet->getPropertyState( nHandleTextGroupingAuto ) != STLPropertyState_AMBIGUOUS)
2384 mpSet->getPropertyValue( nHandleTextGroupingAuto ) >>= fOldTextGroupingAuto;
2385
2386 if( fTextGroupingAuto != fOldTextGroupingAuto )
2387 pSet->setPropertyValue( nHandleTextGroupingAuto, makeAny( fTextGroupingAuto ) );
2388 }
2389 }
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 2373 unchanged lines hidden (view full) ---

2382
2383 if(mpSet->getPropertyState( nHandleTextGroupingAuto ) != STLPropertyState_AMBIGUOUS)
2384 mpSet->getPropertyValue( nHandleTextGroupingAuto ) >>= fOldTextGroupingAuto;
2385
2386 if( fTextGroupingAuto != fOldTextGroupingAuto )
2387 pSet->setPropertyValue( nHandleTextGroupingAuto, makeAny( fTextGroupingAuto ) );
2388 }
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();
2392 sal_Bool bOldAnimateForm = !bAnimateForm;
2398 if(mpSet->getPropertyState( nHandleAnimateForm ) != STLPropertyState_AMBIGUOUS)
2399 mpSet->getPropertyValue( nHandleAnimateForm ) >>= bOldAnimateForm;
2393
2400
2394 if(mpSet->getPropertyState( nHandleAnimateForm ) != STLPropertyState_AMBIGUOUS)
2395 mpSet->getPropertyValue( nHandleAnimateForm ) >>= bOldAnimateForm;
2396
2397 if( bAnimateForm != bOldAnimateForm )
2398 pSet->setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm ) );
2401 if( bAnimateForm != bOldAnimateForm )
2402 pSet->setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm ) );
2403 }
2399}
2400
2401void CustomAnimationTextAnimTabPage::updateControlStates()
2402{
2403 sal_uInt16 nPos = maLBGroupText.GetSelectEntryPos();
2404
2405 maCBXGroupAuto.Enable( nPos > 1 );
2406 maMFGroupAuto.Enable( nPos > 1 );

--- 228 unchanged lines hidden --- 		2404}
2405
2406void CustomAnimationTextAnimTabPage::updateControlStates()
2407{
2408 sal_uInt16 nPos = maLBGroupText.GetSelectEntryPos();
2409
2410 maCBXGroupAuto.Enable( nPos > 1 );
2411 maMFGroupAuto.Enable( nPos > 1 );

--- 228 unchanged lines hidden ---