diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-02-24 09:37:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-24 12:53:09 +0000 |
| commit | b854cb787ec56ddaf62fc9a6883c0ead6f0208a8 (patch) | |
| tree | 853d78e04f21035fe045f6878e05f91ecea999b8 | |
| parent | 819cc6431878302717442b141415c08d8bf4493a (diff) | |
coverity#735747 Dereference after null check
also
coverity#736774 Dereference before null check
Change-Id: Ic2e2a341565af0609ec748b40ac7848a46c9e3af
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 392e30e3846b..6fb5d425710c 100644 --- 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 ) ) |