mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: #i121410# Secured usage of pTextGroup

Browse Source 
(cherry picked from commit 966c38038352a347f25d690f18a2059d6f78b9fa)

Change-Id: Ibbd68e8c102f2d80ea5b7610b9a97704a282e6ea
This commit is contained in:
Armin Le Grand 2014-06-20 11:51:09 +00:00 committed by Caolán McNamara
parent 465503f52d
commit 553f88e3d6
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sd/source/ui/animations/CustomAnimationPane.cxx
View File

@ -1500,7 +1500,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper
if( bHasAnimateForm ) if( bHasAnimateForm )
{ {
if( pTextGroup->getAnimateForm() != bAnimateForm ) if( pTextGroup.get() && pTextGroup->getAnimateForm() != bAnimateForm )
{ {
if( (pTextGroup->getTextGrouping() >= 0) && (nTextGrouping == -1 ) ) if( (pTextGroup->getTextGrouping() >= 0) && (nTextGrouping == -1 ) )
{ {
@ -1518,22 +1518,25 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper
if( bHasTextGrouping ) if( bHasTextGrouping )
{ {
if( (pTextGroup->getTextGrouping() != nTextGrouping) ) if( pTextGroup.get() && pTextGroup->getTextGrouping() != nTextGrouping )
{ {
pEffectSequence->setTextGrouping( pTextGroup, nTextGrouping ); pEffectSequence->setTextGrouping( pTextGroup, nTextGrouping );
bChanged = true; bChanged = true;
} }
} }
if (!bDoSetAnimateFormFirst&&bNeedDoSetAnimateForm) if (!bDoSetAnimateFormFirst && bNeedDoSetAnimateForm)
{ {
pEffectSequence->setAnimateForm( pTextGroup, bAnimateForm ); if( pTextGroup.get() )
bChanged = true; {
pEffectSequence->setAnimateForm( pTextGroup, bAnimateForm );
bChanged = true;
}
} }
if( bHasTextGroupingAuto ) if( bHasTextGroupingAuto )
{ {
if( pTextGroup->getTextGroupingAuto() != fTextGroupingAuto ) if( pTextGroup.get() && pTextGroup->getTextGroupingAuto() != fTextGroupingAuto )
{ {
pEffectSequence->setTextGroupingAuto( pTextGroup, fTextGroupingAuto ); pEffectSequence->setTextGroupingAuto( pTextGroup, fTextGroupingAuto );
bChanged = true; bChanged = true;
@ -1542,7 +1545,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper
if( bHasTextReverse ) if( bHasTextReverse )
{ {
if( pTextGroup->getTextReverse() != bTextReverse ) if( pTextGroup.get() && pTextGroup->getTextReverse() != bTextReverse )
{ {
pEffectSequence->setTextReverse( pTextGroup, bTextReverse ); pEffectSequence->setTextReverse( pTextGroup, bTextReverse );
bChanged = true; bChanged = true;