1 files changed, 269 insertions, 269 deletions
diff --git a/xfa/fxfa/fxfa_basic.h b/xfa/fxfa/fxfa_basic.h
index 0f4ea37e3f..1f375cdcac 100644
--- a/xfa/fxfa/fxfa_basic.h
+++ b/xfa/fxfa/fxfa_basic.h
@@ -97,273 +97,273 @@ enum XFA_XDPPACKET_FLAGS {
   XFA_XDPPACKET_FLAGS_SUPPORTMANY = 16,
 };
 
-enum XFA_ATTRIBUTEENUM {
-  XFA_ATTRIBUTEENUM_Asterisk,
-  XFA_ATTRIBUTEENUM_Slash,
-  XFA_ATTRIBUTEENUM_Backslash,
-  XFA_ATTRIBUTEENUM_On,
-  XFA_ATTRIBUTEENUM_Tb,
-  XFA_ATTRIBUTEENUM_Up,
-  XFA_ATTRIBUTEENUM_MetaData,
-  XFA_ATTRIBUTEENUM_Delegate,
-  XFA_ATTRIBUTEENUM_PostSubmit,
-  XFA_ATTRIBUTEENUM_Name,
-  XFA_ATTRIBUTEENUM_Cross,
-  XFA_ATTRIBUTEENUM_Next,
-  XFA_ATTRIBUTEENUM_None,
-  XFA_ATTRIBUTEENUM_ShortEdge,
-  XFA_ATTRIBUTEENUM_1mod10_1mod11,
-  XFA_ATTRIBUTEENUM_Height,
-  XFA_ATTRIBUTEENUM_CrossDiagonal,
-  XFA_ATTRIBUTEENUM_All,
-  XFA_ATTRIBUTEENUM_Any,
-  XFA_ATTRIBUTEENUM_ToRight,
-  XFA_ATTRIBUTEENUM_MatchTemplate,
-  XFA_ATTRIBUTEENUM_Dpl,
-  XFA_ATTRIBUTEENUM_Invisible,
-  XFA_ATTRIBUTEENUM_Fit,
-  XFA_ATTRIBUTEENUM_Width,
-  XFA_ATTRIBUTEENUM_PreSubmit,
-  XFA_ATTRIBUTEENUM_Ipl,
-  XFA_ATTRIBUTEENUM_FlateCompress,
-  XFA_ATTRIBUTEENUM_Med,
-  XFA_ATTRIBUTEENUM_Odd,
-  XFA_ATTRIBUTEENUM_Off,
-  XFA_ATTRIBUTEENUM_Pdf,
-  XFA_ATTRIBUTEENUM_Row,
-  XFA_ATTRIBUTEENUM_Top,
-  XFA_ATTRIBUTEENUM_Xdp,
-  XFA_ATTRIBUTEENUM_Xfd,
-  XFA_ATTRIBUTEENUM_Xml,
-  XFA_ATTRIBUTEENUM_Zip,
-  XFA_ATTRIBUTEENUM_Zpl,
-  XFA_ATTRIBUTEENUM_Visible,
-  XFA_ATTRIBUTEENUM_Exclude,
-  XFA_ATTRIBUTEENUM_MouseEnter,
-  XFA_ATTRIBUTEENUM_Pair,
-  XFA_ATTRIBUTEENUM_Filter,
-  XFA_ATTRIBUTEENUM_MoveLast,
-  XFA_ATTRIBUTEENUM_ExportAndImport,
-  XFA_ATTRIBUTEENUM_Push,
-  XFA_ATTRIBUTEENUM_Portrait,
-  XFA_ATTRIBUTEENUM_Default,
-  XFA_ATTRIBUTEENUM_StoredProc,
-  XFA_ATTRIBUTEENUM_StayBOF,
-  XFA_ATTRIBUTEENUM_StayEOF,
-  XFA_ATTRIBUTEENUM_PostPrint,
-  XFA_ATTRIBUTEENUM_UsCarrier,
-  XFA_ATTRIBUTEENUM_Right,
-  XFA_ATTRIBUTEENUM_PreOpen,
-  XFA_ATTRIBUTEENUM_Actual,
-  XFA_ATTRIBUTEENUM_Rest,
-  XFA_ATTRIBUTEENUM_TopCenter,
-  XFA_ATTRIBUTEENUM_StandardSymbol,
-  XFA_ATTRIBUTEENUM_Initialize,
-  XFA_ATTRIBUTEENUM_JustifyAll,
-  XFA_ATTRIBUTEENUM_Normal,
-  XFA_ATTRIBUTEENUM_Landscape,
-  XFA_ATTRIBUTEENUM_NonInteractive,
-  XFA_ATTRIBUTEENUM_MouseExit,
-  XFA_ATTRIBUTEENUM_Minus,
-  XFA_ATTRIBUTEENUM_DiagonalLeft,
-  XFA_ATTRIBUTEENUM_SimplexPaginated,
-  XFA_ATTRIBUTEENUM_Document,
-  XFA_ATTRIBUTEENUM_Warning,
-  XFA_ATTRIBUTEENUM_Auto,
-  XFA_ATTRIBUTEENUM_Below,
-  XFA_ATTRIBUTEENUM_BottomLeft,
-  XFA_ATTRIBUTEENUM_BottomCenter,
-  XFA_ATTRIBUTEENUM_Tcpl,
-  XFA_ATTRIBUTEENUM_Text,
-  XFA_ATTRIBUTEENUM_Grouping,
-  XFA_ATTRIBUTEENUM_SecureSymbol,
-  XFA_ATTRIBUTEENUM_PreExecute,
-  XFA_ATTRIBUTEENUM_DocClose,
-  XFA_ATTRIBUTEENUM_Keyset,
-  XFA_ATTRIBUTEENUM_Vertical,
-  XFA_ATTRIBUTEENUM_PreSave,
-  XFA_ATTRIBUTEENUM_PreSign,
-  XFA_ATTRIBUTEENUM_Bottom,
-  XFA_ATTRIBUTEENUM_ToTop,
-  XFA_ATTRIBUTEENUM_Verify,
-  XFA_ATTRIBUTEENUM_First,
-  XFA_ATTRIBUTEENUM_ContentArea,
-  XFA_ATTRIBUTEENUM_Solid,
-  XFA_ATTRIBUTEENUM_Pessimistic,
-  XFA_ATTRIBUTEENUM_DuplexPaginated,
-  XFA_ATTRIBUTEENUM_Round,
-  XFA_ATTRIBUTEENUM_Remerge,
-  XFA_ATTRIBUTEENUM_Ordered,
-  XFA_ATTRIBUTEENUM_Percent,
-  XFA_ATTRIBUTEENUM_Even,
-  XFA_ATTRIBUTEENUM_Exit,
-  XFA_ATTRIBUTEENUM_ToolTip,
-  XFA_ATTRIBUTEENUM_OrderedOccurrence,
-  XFA_ATTRIBUTEENUM_ReadOnly,
-  XFA_ATTRIBUTEENUM_Currency,
-  XFA_ATTRIBUTEENUM_Concat,
-  XFA_ATTRIBUTEENUM_Thai,
-  XFA_ATTRIBUTEENUM_Embossed,
-  XFA_ATTRIBUTEENUM_Formdata,
-  XFA_ATTRIBUTEENUM_Greek,
-  XFA_ATTRIBUTEENUM_Decimal,
-  XFA_ATTRIBUTEENUM_Select,
-  XFA_ATTRIBUTEENUM_LongEdge,
-  XFA_ATTRIBUTEENUM_Protected,
-  XFA_ATTRIBUTEENUM_BottomRight,
-  XFA_ATTRIBUTEENUM_Zero,
-  XFA_ATTRIBUTEENUM_ForwardOnly,
-  XFA_ATTRIBUTEENUM_DocReady,
-  XFA_ATTRIBUTEENUM_Hidden,
-  XFA_ATTRIBUTEENUM_Include,
-  XFA_ATTRIBUTEENUM_Dashed,
-  XFA_ATTRIBUTEENUM_MultiSelect,
-  XFA_ATTRIBUTEENUM_Inactive,
-  XFA_ATTRIBUTEENUM_Embed,
-  XFA_ATTRIBUTEENUM_Static,
-  XFA_ATTRIBUTEENUM_OnEntry,
-  XFA_ATTRIBUTEENUM_Cyrillic,
-  XFA_ATTRIBUTEENUM_NonBlank,
-  XFA_ATTRIBUTEENUM_TopRight,
-  XFA_ATTRIBUTEENUM_Hebrew,
-  XFA_ATTRIBUTEENUM_TopLeft,
-  XFA_ATTRIBUTEENUM_Center,
-  XFA_ATTRIBUTEENUM_MoveFirst,
-  XFA_ATTRIBUTEENUM_Diamond,
-  XFA_ATTRIBUTEENUM_PageOdd,
-  XFA_ATTRIBUTEENUM_1mod10,
-  XFA_ATTRIBUTEENUM_Korean,
-  XFA_ATTRIBUTEENUM_AboveEmbedded,
-  XFA_ATTRIBUTEENUM_ZipCompress,
-  XFA_ATTRIBUTEENUM_Numeric,
-  XFA_ATTRIBUTEENUM_Circle,
-  XFA_ATTRIBUTEENUM_ToBottom,
-  XFA_ATTRIBUTEENUM_Inverted,
-  XFA_ATTRIBUTEENUM_Update,
-  XFA_ATTRIBUTEENUM_Isoname,
-  XFA_ATTRIBUTEENUM_Server,
-  XFA_ATTRIBUTEENUM_Position,
-  XFA_ATTRIBUTEENUM_MiddleCenter,
-  XFA_ATTRIBUTEENUM_Optional,
-  XFA_ATTRIBUTEENUM_UsePrinterSetting,
-  XFA_ATTRIBUTEENUM_Outline,
-  XFA_ATTRIBUTEENUM_IndexChange,
-  XFA_ATTRIBUTEENUM_Change,
-  XFA_ATTRIBUTEENUM_PageArea,
-  XFA_ATTRIBUTEENUM_Once,
-  XFA_ATTRIBUTEENUM_Only,
-  XFA_ATTRIBUTEENUM_Open,
-  XFA_ATTRIBUTEENUM_Caption,
-  XFA_ATTRIBUTEENUM_Raised,
-  XFA_ATTRIBUTEENUM_Justify,
-  XFA_ATTRIBUTEENUM_RefAndDescendants,
-  XFA_ATTRIBUTEENUM_Short,
-  XFA_ATTRIBUTEENUM_PageFront,
-  XFA_ATTRIBUTEENUM_Monospace,
-  XFA_ATTRIBUTEENUM_Middle,
-  XFA_ATTRIBUTEENUM_PrePrint,
-  XFA_ATTRIBUTEENUM_Always,
-  XFA_ATTRIBUTEENUM_Unknown,
-  XFA_ATTRIBUTEENUM_ToLeft,
-  XFA_ATTRIBUTEENUM_Above,
-  XFA_ATTRIBUTEENUM_DashDot,
-  XFA_ATTRIBUTEENUM_Gregorian,
-  XFA_ATTRIBUTEENUM_Roman,
-  XFA_ATTRIBUTEENUM_MouseDown,
-  XFA_ATTRIBUTEENUM_Symbol,
-  XFA_ATTRIBUTEENUM_PageEven,
-  XFA_ATTRIBUTEENUM_Sign,
-  XFA_ATTRIBUTEENUM_AddNew,
-  XFA_ATTRIBUTEENUM_Star,
-  XFA_ATTRIBUTEENUM_Optimistic,
-  XFA_ATTRIBUTEENUM_Rl_tb,
-  XFA_ATTRIBUTEENUM_MiddleRight,
-  XFA_ATTRIBUTEENUM_Maintain,
-  XFA_ATTRIBUTEENUM_Package,
-  XFA_ATTRIBUTEENUM_SimplifiedChinese,
-  XFA_ATTRIBUTEENUM_ToCenter,
-  XFA_ATTRIBUTEENUM_Back,
-  XFA_ATTRIBUTEENUM_Unspecified,
-  XFA_ATTRIBUTEENUM_BatchOptimistic,
-  XFA_ATTRIBUTEENUM_Bold,
-  XFA_ATTRIBUTEENUM_Both,
-  XFA_ATTRIBUTEENUM_Butt,
-  XFA_ATTRIBUTEENUM_Client,
-  XFA_ATTRIBUTEENUM_2mod10,
-  XFA_ATTRIBUTEENUM_ImageOnly,
-  XFA_ATTRIBUTEENUM_Horizontal,
-  XFA_ATTRIBUTEENUM_Dotted,
-  XFA_ATTRIBUTEENUM_UserControl,
-  XFA_ATTRIBUTEENUM_DiagonalRight,
-  XFA_ATTRIBUTEENUM_ConsumeData,
-  XFA_ATTRIBUTEENUM_Check,
-  XFA_ATTRIBUTEENUM_Data,
-  XFA_ATTRIBUTEENUM_Down,
-  XFA_ATTRIBUTEENUM_SansSerif,
-  XFA_ATTRIBUTEENUM_Inline,
-  XFA_ATTRIBUTEENUM_TraditionalChinese,
-  XFA_ATTRIBUTEENUM_Warn,
-  XFA_ATTRIBUTEENUM_RefOnly,
-  XFA_ATTRIBUTEENUM_InteractiveForms,
-  XFA_ATTRIBUTEENUM_Word,
-  XFA_ATTRIBUTEENUM_Unordered,
-  XFA_ATTRIBUTEENUM_Required,
-  XFA_ATTRIBUTEENUM_ImportOnly,
-  XFA_ATTRIBUTEENUM_BelowEmbedded,
-  XFA_ATTRIBUTEENUM_Japanese,
-  XFA_ATTRIBUTEENUM_Full,
-  XFA_ATTRIBUTEENUM_Rl_row,
-  XFA_ATTRIBUTEENUM_Vietnamese,
-  XFA_ATTRIBUTEENUM_EastEuropeanRoman,
-  XFA_ATTRIBUTEENUM_MouseUp,
-  XFA_ATTRIBUTEENUM_ExportOnly,
-  XFA_ATTRIBUTEENUM_Clear,
-  XFA_ATTRIBUTEENUM_Click,
-  XFA_ATTRIBUTEENUM_Base64,
-  XFA_ATTRIBUTEENUM_Close,
-  XFA_ATTRIBUTEENUM_Host,
-  XFA_ATTRIBUTEENUM_Global,
-  XFA_ATTRIBUTEENUM_Blank,
-  XFA_ATTRIBUTEENUM_Table,
-  XFA_ATTRIBUTEENUM_Import,
-  XFA_ATTRIBUTEENUM_Custom,
-  XFA_ATTRIBUTEENUM_MiddleLeft,
-  XFA_ATTRIBUTEENUM_PostExecute,
-  XFA_ATTRIBUTEENUM_Radix,
-  XFA_ATTRIBUTEENUM_PostOpen,
-  XFA_ATTRIBUTEENUM_Enter,
-  XFA_ATTRIBUTEENUM_Ignore,
-  XFA_ATTRIBUTEENUM_Lr_tb,
-  XFA_ATTRIBUTEENUM_Fantasy,
-  XFA_ATTRIBUTEENUM_Italic,
-  XFA_ATTRIBUTEENUM_Author,
-  XFA_ATTRIBUTEENUM_ToEdge,
-  XFA_ATTRIBUTEENUM_Choice,
-  XFA_ATTRIBUTEENUM_Disabled,
-  XFA_ATTRIBUTEENUM_CrossHatch,
-  XFA_ATTRIBUTEENUM_DataRef,
-  XFA_ATTRIBUTEENUM_DashDotDot,
-  XFA_ATTRIBUTEENUM_Square,
-  XFA_ATTRIBUTEENUM_Dynamic,
-  XFA_ATTRIBUTEENUM_Manual,
-  XFA_ATTRIBUTEENUM_Etched,
-  XFA_ATTRIBUTEENUM_ValidationState,
-  XFA_ATTRIBUTEENUM_Cursive,
-  XFA_ATTRIBUTEENUM_Last,
-  XFA_ATTRIBUTEENUM_Left,
-  XFA_ATTRIBUTEENUM_Link,
-  XFA_ATTRIBUTEENUM_Long,
-  XFA_ATTRIBUTEENUM_InternationalCarrier,
-  XFA_ATTRIBUTEENUM_PDF1_3,
-  XFA_ATTRIBUTEENUM_PDF1_6,
-  XFA_ATTRIBUTEENUM_Serif,
-  XFA_ATTRIBUTEENUM_PostSave,
-  XFA_ATTRIBUTEENUM_Ready,
-  XFA_ATTRIBUTEENUM_PostSign,
-  XFA_ATTRIBUTEENUM_Arabic,
-  XFA_ATTRIBUTEENUM_Error,
-  XFA_ATTRIBUTEENUM_Urlencoded,
-  XFA_ATTRIBUTEENUM_Lowered,
+enum class XFA_AttributeEnum : uint32_t {
+  Asterisk,
+  Slash,
+  Backslash,
+  On,
+  Tb,
+  Up,
+  MetaData,
+  Delegate,
+  PostSubmit,
+  Name,
+  Cross,
+  Next,
+  None,
+  ShortEdge,
+  Checksum_1mod10_1mod11,
+  Height,
+  CrossDiagonal,
+  All,
+  Any,
+  ToRight,
+  MatchTemplate,
+  Dpl,
+  Invisible,
+  Fit,
+  Width,
+  PreSubmit,
+  Ipl,
+  FlateCompress,
+  Med,
+  Odd,
+  Off,
+  Pdf,
+  Row,
+  Top,
+  Xdp,
+  Xfd,
+  Xml,
+  Zip,
+  Zpl,
+  Visible,
+  Exclude,
+  MouseEnter,
+  Pair,
+  Filter,
+  MoveLast,
+  ExportAndImport,
+  Push,
+  Portrait,
+  Default,
+  StoredProc,
+  StayBOF,
+  StayEOF,
+  PostPrint,
+  UsCarrier,
+  Right,
+  PreOpen,
+  Actual,
+  Rest,
+  TopCenter,
+  StandardSymbol,
+  Initialize,
+  JustifyAll,
+  Normal,
+  Landscape,
+  NonInteractive,
+  MouseExit,
+  Minus,
+  DiagonalLeft,
+  SimplexPaginated,
+  Document,
+  Warning,
+  Auto,
+  Below,
+  BottomLeft,
+  BottomCenter,
+  Tcpl,
+  Text,
+  Grouping,
+  SecureSymbol,
+  PreExecute,
+  DocClose,
+  Keyset,
+  Vertical,
+  PreSave,
+  PreSign,
+  Bottom,
+  ToTop,
+  Verify,
+  First,
+  ContentArea,
+  Solid,
+  Pessimistic,
+  DuplexPaginated,
+  Round,
+  Remerge,
+  Ordered,
+  Percent,
+  Even,
+  Exit,
+  ToolTip,
+  OrderedOccurrence,
+  ReadOnly,
+  Currency,
+  Concat,
+  Thai,
+  Embossed,
+  Formdata,
+  Greek,
+  Decimal,
+  Select,
+  LongEdge,
+  Protected,
+  BottomRight,
+  Zero,
+  ForwardOnly,
+  DocReady,
+  Hidden,
+  Include,
+  Dashed,
+  MultiSelect,
+  Inactive,
+  Embed,
+  Static,
+  OnEntry,
+  Cyrillic,
+  NonBlank,
+  TopRight,
+  Hebrew,
+  TopLeft,
+  Center,
+  MoveFirst,
+  Diamond,
+  PageOdd,
+  Checksum_1mod10,
+  Korean,
+  AboveEmbedded,
+  ZipCompress,
+  Numeric,
+  Circle,
+  ToBottom,
+  Inverted,
+  Update,
+  Isoname,
+  Server,
+  Position,
+  MiddleCenter,
+  Optional,
+  UsePrinterSetting,
+  Outline,
+  IndexChange,
+  Change,
+  PageArea,
+  Once,
+  Only,
+  Open,
+  Caption,
+  Raised,
+  Justify,
+  RefAndDescendants,
+  Short,
+  PageFront,
+  Monospace,
+  Middle,
+  PrePrint,
+  Always,
+  Unknown,
+  ToLeft,
+  Above,
+  DashDot,
+  Gregorian,
+  Roman,
+  MouseDown,
+  Symbol,
+  PageEven,
+  Sign,
+  AddNew,
+  Star,
+  Optimistic,
+  Rl_tb,
+  MiddleRight,
+  Maintain,
+  Package,
+  SimplifiedChinese,
+  ToCenter,
+  Back,
+  Unspecified,
+  BatchOptimistic,
+  Bold,
+  Both,
+  Butt,
+  Client,
+  Checksum_2mod10,
+  ImageOnly,
+  Horizontal,
+  Dotted,
+  UserControl,
+  DiagonalRight,
+  ConsumeData,
+  Check,
+  Data,
+  Down,
+  SansSerif,
+  Inline,
+  TraditionalChinese,
+  Warn,
+  RefOnly,
+  InteractiveForms,
+  Word,
+  Unordered,
+  Required,
+  ImportOnly,
+  BelowEmbedded,
+  Japanese,
+  Full,
+  Rl_row,
+  Vietnamese,
+  EastEuropeanRoman,
+  MouseUp,
+  ExportOnly,
+  Clear,
+  Click,
+  Base64,
+  Close,
+  Host,
+  Global,
+  Blank,
+  Table,
+  Import,
+  Custom,
+  MiddleLeft,
+  PostExecute,
+  Radix,
+  PostOpen,
+  Enter,
+  Ignore,
+  Lr_tb,
+  Fantasy,
+  Italic,
+  Author,
+  ToEdge,
+  Choice,
+  Disabled,
+  CrossHatch,
+  DataRef,
+  DashDotDot,
+  Square,
+  Dynamic,
+  Manual,
+  Etched,
+  ValidationState,
+  Cursive,
+  Last,
+  Left,
+  Link,
+  Long,
+  InternationalCarrier,
+  PDF1_3,
+  PDF1_6,
+  Serif,
+  PostSave,
+  Ready,
+  PostSign,
+  Arabic,
+  Error,
+  Urlencoded,
+  Lowered
 };
 
 enum class XFA_Attribute : uint8_t {
@@ -949,10 +949,10 @@ struct XFA_SCRIPTHIERARCHY {
 #define XFA_PROPERTYFLAG_OneOf 0x01
 #define XFA_PROPERTYFLAG_DefaultOneOf 0x02
 
-struct XFA_ATTRIBUTEENUMINFO {
+struct XFA_AttributeEnumInfo {
   uint32_t uHash;
   const wchar_t* pName;
-  XFA_ATTRIBUTEENUM eName;
+  XFA_AttributeEnum eName;
 };
 
 enum class XFA_Unit : uint8_t {