strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#120703 PVS: V547 Expression '!pTmp' is always true

Browse source 
Change-Id: Ia31961d65592ebd2718446eaa931aab785b8ba65
Reviewed-on: https://gerrit.libreoffice.org/62457
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2018-10-28 01:21:32 +03:00
parent 871089ecca
commit fd855967e0
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sd/source/filter/eppt/epptso.cxx
View file

@ -1720,17 +1720,14 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
aXIndexAccess( mXShape, css::uno::UNO_QUERY );
if ( EnterGroup( aXIndexAccess ) )
{
SvMemoryStream* pTmp = nullptr;
std::unique_ptr<SvMemoryStream> pTmp;
if ( eCa != css::presentation::ClickAction_NONE )
{
if ( !pTmp )
pTmp = new SvMemoryStream( 0x200, 0x200 );
pTmp.reset(new SvMemoryStream(0x200, 0x200));
ImplWriteClickAction( *pTmp, eCa, bMediaClickAction );
}
sal_uInt32 nShapeId = mpPptEscherEx->EnterGroup( &maRect, pTmp );
sal_uInt32 nShapeId = mpPptEscherEx->EnterGroup(&maRect, pTmp.get());
aSolverContainer.AddShape( mXShape, nShapeId );
delete pTmp;
}
}
else
@ -2697,12 +2694,10 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
else if ( (mType == "drawing.Table") || (mType == "presentation.Table") )
{
SvMemoryStream* pTmp = nullptr;
if ( eCa != css::presentation::ClickAction_NONE )
{
if ( !pTmp )
pTmp = new SvMemoryStream( 0x200, 0x200 );
ImplWriteClickAction( *pTmp, eCa, bMediaClickAction );
SvMemoryStream aTmp(0x200, 0x200);
ImplWriteClickAction( aTmp, eCa, bMediaClickAction );
}
ImplCreateTable( mXShape, aSolverContainer, aPropOpt );
continue;