summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/xfa_basic_data.cpp
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-06-23 07:52:01 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-23 07:52:01 -0700
commit937a11304dbf7abd97b76da8154e2b3bf5141aeb (patch)
tree931234ed6d3d1ec96972c92c720f7600b80a708f /xfa/fxfa/parser/xfa_basic_data.cpp
parent070fcdfeafb17a9d3ada1418f48fd7f19aa4cf83 (diff)
downloadpdfium-937a11304dbf7abd97b76da8154e2b3bf5141aeb.tar.xz
Remove CXFA_OrdinaryObject class
The CXFA_OrdinaryObject class no longer has any functionality but is just wraps CXFA_Object and sets the object type for the sub classes. This Cl removes the class and has the subclass set the object type themselves. This CL also renames the OrdinaryObject type to just Object. Review-Url: https://codereview.chromium.org/2082343003
Diffstat (limited to 'xfa/fxfa/parser/xfa_basic_data.cpp')
-rw-r--r--xfa/fxfa/parser/xfa_basic_data.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/xfa/fxfa/parser/xfa_basic_data.cpp b/xfa/fxfa/parser/xfa_basic_data.cpp
index 7c9d7e6bd7..be1df934c2 100644
--- a/xfa/fxfa/parser/xfa_basic_data.cpp
+++ b/xfa/fxfa/parser/xfa_basic_data.cpp
@@ -1206,13 +1206,13 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
{0x240d5e8e, L"issuers", XFA_Element::Issuers,
XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, XFA_ObjectType::Node},
{0x2457a033, L"signaturePseudoModel", XFA_Element::SignaturePseudoModel,
- XFA_XDPPACKET_XDP, XFA_ObjectType::OrdinaryObject},
+ XFA_XDPPACKET_XDP, XFA_ObjectType::Object},
{0x24a52f8a, L"wsdlConnection", XFA_Element::WsdlConnection,
XFA_XDPPACKET_ConnectionSet, XFA_ObjectType::Node},
{0x254ebd07, L"debug", XFA_Element::Debug, XFA_XDPPACKET_Config,
XFA_ObjectType::Node},
{0x2655c66a, L"delta", XFA_Element::Delta, XFA_XDPPACKET_Form,
- XFA_ObjectType::OrdinaryObject},
+ XFA_ObjectType::Object},
{0x26c0daec, L"eraNames", XFA_Element::EraNames, XFA_XDPPACKET_LocaleSet,
XFA_ObjectType::Node},
{0x273ab03b, L"modifyAnnots", XFA_Element::ModifyAnnots,
@@ -1278,7 +1278,7 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
XFA_XDPPACKET_Template | XFA_XDPPACKET_Form,
XFA_ObjectType::ContainerNode},
{0x3ef334e3, L"eventPseudoModel", XFA_Element::EventPseudoModel,
- XFA_XDPPACKET_XDP, XFA_ObjectType::OrdinaryObject},
+ XFA_XDPPACKET_XDP, XFA_ObjectType::Object},
{0x3fadaec0, L"wsdlAddress", XFA_Element::WsdlAddress,
XFA_XDPPACKET_ConnectionSet, XFA_ObjectType::TextNode},
{0x40623b5b, L"solid", XFA_Element::Solid,
@@ -1347,7 +1347,7 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
{0x56ae179e, L"handler", XFA_Element::Handler,
XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, XFA_ObjectType::TextNode},
{0x5700bd5f, L"hostPseudoModel", XFA_Element::HostPseudoModel,
- XFA_XDPPACKET_XDP, XFA_ObjectType::OrdinaryObject},
+ XFA_XDPPACKET_XDP, XFA_ObjectType::Object},
{0x570ce835, L"presence", XFA_Element::Presence, XFA_XDPPACKET_Config,
XFA_ObjectType::NodeV},
{0x5779d65f, L"record", XFA_Element::Record, XFA_XDPPACKET_Config,
@@ -1388,7 +1388,7 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
{0x68a16bbd, L"webClient", XFA_Element::WebClient, XFA_XDPPACKET_Config,
XFA_ObjectType::Node},
{0x69f115df, L"layoutPseudoModel", XFA_Element::LayoutPseudoModel,
- XFA_XDPPACKET_XDP, XFA_ObjectType::OrdinaryObject},
+ XFA_XDPPACKET_XDP, XFA_ObjectType::Object},
{0x6a4bc084, L"producer", XFA_Element::Producer, XFA_XDPPACKET_Config,
XFA_ObjectType::ContentNode},
{0x6a9e04c9, L"corner", XFA_Element::Corner,
@@ -1452,7 +1452,7 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
{0x830e688f, L"signing", XFA_Element::Signing,
XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, XFA_ObjectType::Node},
{0x83a550d2, L"dataWindow", XFA_Element::DataWindow, XFA_XDPPACKET_Datasets,
- XFA_ObjectType::OrdinaryObject},
+ XFA_ObjectType::Object},
{0x83dab9f5, L"script", XFA_Element::Script,
XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form,
XFA_ObjectType::ContentNode},
@@ -1504,7 +1504,7 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
{0x9c6471b3, L"delete", XFA_Element::Delete, XFA_XDPPACKET_SourceSet,
XFA_ObjectType::TextNode},
{0x9deea61d, L"deltas", XFA_Element::Deltas, XFA_XDPPACKET_Form,
- XFA_ObjectType::OrdinaryObject},
+ XFA_ObjectType::Object},
{0x9e67de21, L"digestMethod", XFA_Element::DigestMethod,
XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, XFA_ObjectType::NodeC},
{0x9f3e9510, L"instanceManager", XFA_Element::InstanceManager,
@@ -1624,7 +1624,7 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
{0xd17a6c30, L"renderPolicy", XFA_Element::RenderPolicy,
XFA_XDPPACKET_Config, XFA_ObjectType::ContentNode},
{0xd4bf6823, L"logPseudoModel", XFA_Element::LogPseudoModel,
- XFA_XDPPACKET_XDP, XFA_ObjectType::OrdinaryObject},
+ XFA_XDPPACKET_XDP, XFA_ObjectType::Object},
{0xd58aa962, L"destination", XFA_Element::Destination, XFA_XDPPACKET_Config,
XFA_ObjectType::ContentNode},
{0xd6e27f1d, L"value", XFA_Element::Value,