diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-21 11:22:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-21 18:52:05 +0100 |
| commit | bd26a8efd5ae0054b9be880870df166299759a30 (patch) | |
| tree | a36608348a600c1c2fe62e9dc0a8ea1344692e1f /basic | |
| parent | eef4268f05ca7771651d48ab661276981ef7d573 (diff) | |
use unique_ptr in SbiExpression
Change-Id: I8b44215c438b749afce4ad056cab2c2ac66d4bda
Reviewed-on: https://gerrit.libreoffice.org/65534
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/comp/exprtree.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx index a8bae29ebbe5..20d0691cd0c9 100644 --- a/basic/source/comp/exprtree.cxx +++ b/basic/source/comp/exprtree.cxx @@ -191,7 +191,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Term( const KeywordSymbolInfo* pKeyw OUString aSym( (pKeywordSymbolInfo == nullptr) ? pParser->GetSym() : pKeywordSymbolInfo->m_aKeywordSymbol ); SbxDataType eType = (pKeywordSymbolInfo == nullptr) ? pParser->GetType() : pKeywordSymbolInfo->m_eSbxDataType; SbiExprListPtr pPar; - SbiExprListVector* pvMoreParLcl = nullptr; + std::unique_ptr<SbiExprListVector> pvMoreParLcl; // are there parameters following? SbiToken eNextTok = pParser->Peek(); // is it a known parameter? @@ -224,7 +224,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Term( const KeywordSymbolInfo* pKeyw { if( pvMoreParLcl == nullptr ) { - pvMoreParLcl = new SbiExprListVector; + pvMoreParLcl.reset(new SbiExprListVector); } SbiExprListPtr pAddPar = SbiExprList::ParseParameters( pParser ); bError = bError || !pAddPar->IsValid(); @@ -289,7 +289,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Term( const KeywordSymbolInfo* pKeyw if( pConst ) { pPar = nullptr; - delete pvMoreParLcl; + pvMoreParLcl.reset(); if( pConst->GetType() == SbxSTRING ) { return o3tl::make_unique<SbiExprNode>( pConst->GetString() ); @@ -353,7 +353,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Term( const KeywordSymbolInfo* pKeyw pPar = SbiExprList::ParseParameters( pParser,false,false ); } pNd->aVar.pPar = pPar.release(); - pNd->aVar.pvMorePar = pvMoreParLcl; + pNd->aVar.pvMorePar = pvMoreParLcl.release(); if( bObj ) { // from 8.1.95: Object may also be of the type SbxVARIANT |