summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-30 20:33:20 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-30 20:33:20 +0000
commitb58bf90755050e1bb6c5d33c329cdaf6cdde36ae (patch)
tree00845c6e65f41a6717c94f51e98866a32914d79d /xfa
parent21b08271e32f3142fb840b04adc5d2adb15f4f78 (diff)
downloadpdfium-b58bf90755050e1bb6c5d33c329cdaf6cdde36ae.tar.xz
Rename GetAttributeEnumById to CXFA_Node::AttributeEnumToName
This is more consistent with the attribute and element to name methods. Change-Id: I3a7f9246d6fbaffa27a0068d8f93e717f5801d2a Reviewed-on: https://pdfium-review.googlesource.com/19851 Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa')
-rw-r--r--xfa/fxfa/parser/cxfa_node.cpp7
-rw-r--r--xfa/fxfa/parser/cxfa_node.h3
2 files changed, 6 insertions, 4 deletions
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 4d9e9966cb..99f0eea5a8 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -134,8 +134,11 @@ void ReorderDataNodes(const std::set<CXFA_Node*>& sSet1,
} // namespace
-const XFA_ATTRIBUTEENUMINFO* GetAttributeEnumByID(XFA_ATTRIBUTEENUM eName) {
- return g_XFAEnumData + eName;
+// static
+WideString CXFA_Node::AttributeEnumToName(XFA_ATTRIBUTEENUM item) {
+ if (item >= g_iXFAEnumCount)
+ return L"";
+ return g_XFAEnumData[static_cast<int32_t>(item)].pName;
}
CXFA_Node::CXFA_Node(CXFA_Document* pDoc,
diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h
index b5217ad832..3d0b3db673 100644
--- a/xfa/fxfa/parser/cxfa_node.h
+++ b/xfa/fxfa/parser/cxfa_node.h
@@ -43,8 +43,6 @@ enum XFA_NODEITEM {
XFA_NODEITEM_PrevSibling,
};
-const XFA_ATTRIBUTEENUMINFO* GetAttributeEnumByID(XFA_ATTRIBUTEENUM eName);
-
class CXFA_Node : public CXFA_Object {
public:
struct PropertyData {
@@ -63,6 +61,7 @@ class CXFA_Node : public CXFA_Object {
static WideString ElementToName(XFA_Element elem);
#endif // NDEBUG
+ static WideString AttributeEnumToName(XFA_ATTRIBUTEENUM item);
static XFA_Attribute NameToAttribute(const WideStringView& name);
static WideString AttributeToName(XFA_Attribute attr);
static XFA_Element NameToElement(const WideString& name);