From 017052a077d8f900e3098b8f9115078a037ee805 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 28 Jun 2016 07:43:51 -0700 Subject: Change CXFA_Node::GetClassName to return CXFA_Node::GetClassName currently takes an out parameter and returns void. This CL updates the signature to return the value and require no parameters. Review-Url: https://codereview.chromium.org/2104963002 --- xfa/fxfa/fm2js/xfa_fm2jscontext.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/fm2js') diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp index 88e3527b94..37d52a9d4d 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp @@ -6258,12 +6258,9 @@ int32_t CXFA_FM2JSContext::ResolveObjects(CFXJSE_Value* pThis, CFX_WideString wsName; if (CXFA_Node* pXFANode = pNode->AsNode()) pXFANode->GetAttribute(XFA_ATTRIBUTE_Name, wsName, FALSE); + if (wsName.IsEmpty()) + wsName = FX_WSTRC(L"#") + pNode->GetClassName(); - if (wsName.IsEmpty()) { - CFX_WideStringC className; - pNode->GetClassName(className); - wsName = FX_WSTRC(L"#") + className; - } wsSomExpression = wsName + wsSomExpression; dFlags = XFA_RESOLVENODE_Siblings; } else { -- cgit v1.2.3