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

BASIC : use std::unique_ptr for storing SbiExprList

Browse Source 
Change-Id: I37f2a1c837c6742cf6d403962d2730b5e80004ec
Reviewed-on: https://gerrit.libreoffice.org/22345
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Arnaud Versini
2016-02-13 20:17:41 +01:00
committed by Noel Grandin
parent 7b7ffedfa6
commit f17a4694b0
5 changed files with 37 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
basic/source/comp/exprnode.cxx
View File

@@ -58,7 +58,7 @@ SbiExprNode::SbiExprNode( const OUString& rVal ):
{
}
SbiExprNode::SbiExprNode( const SbiSymDef& r, SbxDataType t, SbiExprList* l ) :
SbiExprNode::SbiExprNode( const SbiSymDef& r, SbxDataType t, SbiExprListPtr l ) :
pWithParent(nullptr),
eNodeType(SbxVARVAL),
eTok(NIL),
@@ -66,7 +66,7 @@ SbiExprNode::SbiExprNode( const SbiSymDef& r, SbxDataType t, SbiExprList* l ) :
{
eType = ( t == SbxVARIANT ) ? r.GetType() : t;
aVar.pDef = const_cast<SbiSymDef*>(&r);
aVar.pPar = l;
aVar.pPar = l.release();
aVar.pvMorePar = nullptr;
aVar.pNext= nullptr;
}
@@ -109,13 +109,7 @@ SbiExprNode::~SbiExprNode()
{
delete aVar.pPar;
delete aVar.pNext;
SbiExprListVector* pvMorePar = aVar.pvMorePar;
if( pvMorePar )
{
for( const auto& pParam : *pvMorePar )
delete pParam;
delete pvMorePar;
}
delete aVar.pvMorePar;
}
}