diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-06-28 07:43:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-28 07:43:51 -0700 |
| commit | 017052a077d8f900e3098b8f9115078a037ee805 (patch) | |
| tree | 849af68a530e45ba66d9333393789dcec0f6561c /xfa/fxfa/parser/xfa_object_imp.cpp | |
| parent | 2d6dda170d84564f6ca5845ea934a886ac9bf746 (diff) | |
| download | pdfium-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/parser/xfa_object_imp.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_object_imp.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp index 04b33b47c9..99198d24f5 100644 --- a/xfa/fxfa/parser/xfa_object_imp.cpp +++ b/xfa/fxfa/parser/xfa_object_imp.cpp @@ -61,8 +61,8 @@ CXFA_Object::CXFA_Object(CXFA_Document* pDocument, CXFA_Object::~CXFA_Object() {} -void CXFA_Object::GetClassName(CFX_WideStringC& wsName) const { - wsName = XFA_GetElementByID(GetElementType())->pName; +CFX_WideStringC CXFA_Object::GetClassName() const { + return XFA_GetElementByID(GetElementType())->pName; } uint32_t CXFA_Object::GetClassHashCode() const { @@ -77,8 +77,7 @@ void CXFA_Object::Script_ObjectClass_ClassName(CFXJSE_Value* pValue, FX_BOOL bSetting, XFA_ATTRIBUTE eAttribute) { if (!bSetting) { - CFX_WideStringC className; - GetClassName(className); + CFX_WideStringC className = GetClassName(); pValue->SetString( FX_UTF8Encode(className.c_str(), className.GetLength()).AsStringC()); } else { @@ -751,9 +750,8 @@ void CXFA_Node::Script_TreeClass_ClassAll(CFXJSE_Value* pValue, ThrowException(XFA_IDS_INVAlID_PROP_SET); } else { uint32_t dwFlag = XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_ALL; - CFX_WideStringC wsName; - GetClassName(wsName); - CFX_WideString wsExpression = FX_WSTRC(L"#") + wsName + FX_WSTRC(L"[*]"); + CFX_WideString wsExpression = + FX_WSTRC(L"#") + GetClassName() + FX_WSTRC(L"[*]"); Script_Som_ResolveNodeList(pValue, wsExpression, dwFlag); } } @@ -965,11 +963,9 @@ void CXFA_Node::Script_NodeClass_LoadXML(CFXJSE_Arguments* pArguments) { CFDE_XMLNode* pThisXMLRoot = GetXMLMappingNode(); pFakeXMLRoot = pThisXMLRoot ? pThisXMLRoot->Clone(FALSE) : nullptr; } - if (!pFakeXMLRoot) { - CFX_WideStringC wsClassName; - GetClassName(wsClassName); - pFakeXMLRoot = new CFDE_XMLElement(CFX_WideString(wsClassName)); - } + if (!pFakeXMLRoot) + pFakeXMLRoot = new CFDE_XMLElement(CFX_WideString(GetClassName())); + if (bIgnoreRoot) { CFDE_XMLNode* pXMLChild = pXMLNode->GetNodeItem(CFDE_XMLNode::FirstChild); while (pXMLChild) { |