From a31098417852bdf13e693a6e0913e0706cf94098 Mon Sep 17 00:00:00 2001 From: tsepez Date: Thu, 28 Apr 2016 16:56:08 -0700 Subject: Convert CFX_PtrArray to typesafe CFX_ArrayTemplate, Part 6 Review-Url: https://codereview.chromium.org/1926303002 --- xfa/fxfa/fm2js/xfa_program.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'xfa/fxfa/fm2js/xfa_program.cpp') diff --git a/xfa/fxfa/fm2js/xfa_program.cpp b/xfa/fxfa/fm2js/xfa_program.cpp index ef5efb214c..a5c429765f 100644 --- a/xfa/fxfa/fm2js/xfa_program.cpp +++ b/xfa/fxfa/fm2js/xfa_program.cpp @@ -17,20 +17,16 @@ int32_t CXFA_FMProgram::Init(const CFX_WideStringC& wsFormcalc) { return m_parse.Init(wsFormcalc, &m_pErrorInfo); } int32_t CXFA_FMProgram::ParseProgram() { - CFX_PtrArray* expressions = 0; + CFX_ArrayTemplate* expressions = nullptr; m_parse.NextToken(); if (!m_pErrorInfo.message.IsEmpty()) { return -1; } expressions = m_parse.ParseTopExpression(); if (!m_pErrorInfo.message.IsEmpty()) { - CXFA_FMExpression* e = 0; - for (int32_t u = 0; u < expressions->GetSize(); ++u) { - e = (CXFA_FMExpression*)expressions->GetAt(u); - if (e) { - delete e; - } - } + for (int32_t u = 0; u < expressions->GetSize(); ++u) + delete expressions->GetAt(u); + delete expressions; return -1; } -- cgit v1.2.3