coverity#735747 Dereference after null check

also coverity#736774 Dereference before null check Change-Id: Ic2e2a341565af0609ec748b40ac7848a46c9e3af

coverity#735747 Dereference after null check
also coverity#736774 Dereference before null check Change-Id: Ic2e2a341565af0609ec748b40ac7848a46c9e3af
b854cb78 · Caolán McNamara · 819cc643 · b854cb78
Kaydet (Commit) b854cb78 authored Şub 24, 2014 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

svdfppt.cxx filter/source/msfilter/svdfppt.cxx +1 -1

No files found.
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1857,7 +1857,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId,
                                if ( !pRet && ( pOe->nType == PPT_PST_ExControl ) )
                                {
                                    uno::Reference< io::XInputStream > xIStrm = new utl::OSeekableInputStreamWrapper(*pDest );
-                                    uno::Reference< frame::XModel > xModel( pOe->pShell ? pOe->pShell->GetModel() : NULL );
+                                    uno::Reference< frame::XModel > xModel( pOe->pShell->GetModel() );
                                    PPTConvertOCXControls aPPTConvertOCXControls( this, xIStrm, xModel, eAktPageKind );
                                    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape;
                                    if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape, sal_False ) )