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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sun Oct 21 21:17:46 UTC 2018


 oox/source/ppt/pptshapegroupcontext.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 89aefcb877567ad3fde2d6ddc4c4f9f620ab2661
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sun Oct 21 21:55:47 2018 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sun Oct 21 23:17:24 2018 +0200

    tdf#120703 (PVS): redundant nullptr check
    
    V668 There is no sense in testing the 'pBackgroundPropertiesPtr' pointer
         against null, as the memory was allocated using the 'new' operator.
         The exception will be generated in the case of memory allocation error.
    
    Change-Id: I728ffa74ec5e1f1f428224c79bd17c53b3ad3829
    Reviewed-on: https://gerrit.libreoffice.org/62150
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx
index de8db9b237cd..4caa76b1c1c7 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -109,9 +109,7 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext( sal_Int32 aElementToken
                     pBackgroundPropertiesPtr->moFillType = XML_solidFill;
                     pBackgroundPropertiesPtr->maFillColor.setSrgbClr(0xFFFFFF);
                 }
-                if ( pBackgroundPropertiesPtr ) {
-                    pShape->getFillProperties().assignUsed( *pBackgroundPropertiesPtr );
-                }
+                pShape->getFillProperties().assignUsed( *pBackgroundPropertiesPtr );
             }
             pShape->setModelId(rAttribs.getString( XML_modelId ).get());
             return new PPTShapeContext( *this, mpSlidePersistPtr, mpGroupShapePtr, pShape );


More information about the Libreoffice-commits mailing list