[Libreoffice-commits] core.git: sd/source

[Armin Le Grand]

 sd/source/ui/animations/CustomAnimationPane.cxx |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 553f88e3d65fd25f645c22589de575924c3879fc
Author: Armin Le Grand <alg at apache.org>
Date:   Fri Jun 20 11:51:09 2014 +0000

    Resolves: #i121410# Secured usage of pTextGroup
    
    (cherry picked from commit 966c38038352a347f25d690f18a2059d6f78b9fa)
    
    Change-Id: Ibbd68e8c102f2d80ea5b7610b9a97704a282e6ea

diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 2891489..775c8e2 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;