summaryrefslogtreecommitdiff
path: root/xfa/fxfa/fm2js
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-06-28 07:43:51 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-28 07:43:51 -0700
commit017052a077d8f900e3098b8f9115078a037ee805 (patch)
tree849af68a530e45ba66d9333393789dcec0f6561c /xfa/fxfa/fm2js
parent2d6dda170d84564f6ca5845ea934a886ac9bf746 (diff)
downloadpdfium-017052a077d8f900e3098b8f9115078a037ee805.tar.xz
Change CXFA_Node::GetClassName to returnchromium/2786chromium/2784
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
Diffstat (limited to 'xfa/fxfa/fm2js')
-rw-r--r--xfa/fxfa/fm2js/xfa_fm2jscontext.cpp7
1 files changed, 2 insertions, 5 deletions
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 {