diff options
Diffstat (limited to 'sd/source/ui/animations/CustomAnimationPane.cxx')
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 28914899d915..775c8e299bb5 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1500,7 +1500,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( bHasAnimateForm ) { - if( pTextGroup->getAnimateForm() != bAnimateForm ) + if( pTextGroup.get() && pTextGroup->getAnimateForm() != bAnimateForm ) { if( (pTextGroup->getTextGrouping() >= 0) && (nTextGrouping == -1 ) ) { @@ -1518,22 +1518,25 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( bHasTextGrouping ) { - if( (pTextGroup->getTextGrouping() != nTextGrouping) ) + if( pTextGroup.get() && pTextGroup->getTextGrouping() != nTextGrouping ) { pEffectSequence->setTextGrouping( pTextGroup, nTextGrouping ); bChanged = true; } } - if (!bDoSetAnimateFormFirst&&bNeedDoSetAnimateForm) + if (!bDoSetAnimateFormFirst && bNeedDoSetAnimateForm) { - pEffectSequence->setAnimateForm( pTextGroup, bAnimateForm ); - bChanged = true; + if( pTextGroup.get() ) + { + pEffectSequence->setAnimateForm( pTextGroup, bAnimateForm ); + bChanged = true; + } } if( bHasTextGroupingAuto ) { - if( pTextGroup->getTextGroupingAuto() != fTextGroupingAuto ) + if( pTextGroup.get() && pTextGroup->getTextGroupingAuto() != fTextGroupingAuto ) { pEffectSequence->setTextGroupingAuto( pTextGroup, fTextGroupingAuto ); bChanged = true; @@ -1542,7 +1545,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( bHasTextReverse ) { - if( pTextGroup->getTextReverse() != bTextReverse ) + if( pTextGroup.get() && pTextGroup->getTextReverse() != bTextReverse ) { pEffectSequence->setTextReverse( pTextGroup, bTextReverse ); bChanged = true; |