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

coverity#735747 Dereference after null check

Browse Source 
also

coverity#736774 Dereference before null check

Change-Id: Ic2e2a341565af0609ec748b40ac7848a46c9e3af
This commit is contained in:
Caolán McNamara
2014-02-24 09:37:34 +00:00
parent 819cc64318
commit b854cb787e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
filter/source/msfilter/svdfppt.cxx
View File

@@ -1857,7 +1857,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId,
if ( !pRet && ( pOe->nType == PPT_PST_ExControl ) ) if ( !pRet && ( pOe->nType == PPT_PST_ExControl ) )
{ {
uno::Reference< io::XInputStream > xIStrm = new utl::OSeekableInputStreamWrapper(*pDest ); 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 ); PPTConvertOCXControls aPPTConvertOCXControls( this, xIStrm, xModel, eAktPageKind );
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape;
if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape, sal_False ) ) if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape, sal_False ) )