diff options
| author | Armin Le Grand <alg@apache.org> | 2014-06-20 11:51:09 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2014-06-20 11:51:09 +0000 |
| commit | 966c38038352a347f25d690f18a2059d6f78b9fa (patch) | |
| tree | 133f1e69caf65b87001b11e2d7df8e5d10f25414 /sd | |
| parent | a48414a396f7de4e00510e82e3744c097ce3d5d6 (diff) | |
i121410 Secured usage of pTextGroup
Notes
Notes:
merged as: 553f88e3d65fd25f645c22589de575924c3879fc
Diffstat (limited to 'sd')
| -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 6622cda669e2..198621265871 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1786,7 +1786,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 ) ) { @@ -1804,22 +1804,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; @@ -1828,7 +1831,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; |