1 files changed, 250 insertions, 249 deletions
diff --git a/xfa/fxfa/fxfa_basic.h b/xfa/fxfa/fxfa_basic.h
index ccd44cdc13..4497cd9435 100644
--- a/xfa/fxfa/fxfa_basic.h
+++ b/xfa/fxfa/fxfa_basic.h
@@ -366,252 +366,253 @@ enum XFA_ATTRIBUTEENUM {
   XFA_ATTRIBUTEENUM_Urlencoded,
   XFA_ATTRIBUTEENUM_Lowered,
 };
-enum XFA_ATTRIBUTE {
-  XFA_ATTRIBUTE_Unknown = -1,
 
-  XFA_ATTRIBUTE_H,
-  XFA_ATTRIBUTE_W,
-  XFA_ATTRIBUTE_X,
-  XFA_ATTRIBUTE_Y,
-  XFA_ATTRIBUTE_Id,
-  XFA_ATTRIBUTE_To,
-  XFA_ATTRIBUTE_LineThrough,
-  XFA_ATTRIBUTE_HAlign,
-  XFA_ATTRIBUTE_Typeface,
-  XFA_ATTRIBUTE_BeforeTarget,
-  XFA_ATTRIBUTE_Name,
-  XFA_ATTRIBUTE_Next,
-  XFA_ATTRIBUTE_DataRowCount,
-  XFA_ATTRIBUTE_Break,
-  XFA_ATTRIBUTE_VScrollPolicy,
-  XFA_ATTRIBUTE_FontHorizontalScale,
-  XFA_ATTRIBUTE_TextIndent,
-  XFA_ATTRIBUTE_Context,
-  XFA_ATTRIBUTE_TrayOut,
-  XFA_ATTRIBUTE_Cap,
-  XFA_ATTRIBUTE_Max,
-  XFA_ATTRIBUTE_Min,
-  XFA_ATTRIBUTE_Ref,
-  XFA_ATTRIBUTE_Rid,
-  XFA_ATTRIBUTE_Url,
-  XFA_ATTRIBUTE_Use,
-  XFA_ATTRIBUTE_LeftInset,
-  XFA_ATTRIBUTE_Widows,
-  XFA_ATTRIBUTE_Level,
-  XFA_ATTRIBUTE_BottomInset,
-  XFA_ATTRIBUTE_OverflowTarget,
-  XFA_ATTRIBUTE_AllowMacro,
-  XFA_ATTRIBUTE_PagePosition,
-  XFA_ATTRIBUTE_ColumnWidths,
-  XFA_ATTRIBUTE_OverflowLeader,
-  XFA_ATTRIBUTE_Action,
-  XFA_ATTRIBUTE_NonRepudiation,
-  XFA_ATTRIBUTE_Rate,
-  XFA_ATTRIBUTE_AllowRichText,
-  XFA_ATTRIBUTE_Role,
-  XFA_ATTRIBUTE_OverflowTrailer,
-  XFA_ATTRIBUTE_Operation,
-  XFA_ATTRIBUTE_Timeout,
-  XFA_ATTRIBUTE_TopInset,
-  XFA_ATTRIBUTE_Access,
-  XFA_ATTRIBUTE_CommandType,
-  XFA_ATTRIBUTE_Format,
-  XFA_ATTRIBUTE_DataPrep,
-  XFA_ATTRIBUTE_WidgetData,
-  XFA_ATTRIBUTE_Abbr,
-  XFA_ATTRIBUTE_MarginRight,
-  XFA_ATTRIBUTE_DataDescription,
-  XFA_ATTRIBUTE_EncipherOnly,
-  XFA_ATTRIBUTE_KerningMode,
-  XFA_ATTRIBUTE_Rotate,
-  XFA_ATTRIBUTE_WordCharacterCount,
-  XFA_ATTRIBUTE_Type,
-  XFA_ATTRIBUTE_Reserve,
-  XFA_ATTRIBUTE_TextLocation,
-  XFA_ATTRIBUTE_Priority,
-  XFA_ATTRIBUTE_Underline,
-  XFA_ATTRIBUTE_ModuleWidth,
-  XFA_ATTRIBUTE_Hyphenate,
-  XFA_ATTRIBUTE_Listen,
-  XFA_ATTRIBUTE_Delimiter,
-  XFA_ATTRIBUTE_ContentType,
-  XFA_ATTRIBUTE_StartNew,
-  XFA_ATTRIBUTE_EofAction,
-  XFA_ATTRIBUTE_AllowNeutral,
-  XFA_ATTRIBUTE_Connection,
-  XFA_ATTRIBUTE_BaselineShift,
-  XFA_ATTRIBUTE_OverlinePeriod,
-  XFA_ATTRIBUTE_FracDigits,
-  XFA_ATTRIBUTE_Orientation,
-  XFA_ATTRIBUTE_TimeStamp,
-  XFA_ATTRIBUTE_PrintCheckDigit,
-  XFA_ATTRIBUTE_MarginLeft,
-  XFA_ATTRIBUTE_Stroke,
-  XFA_ATTRIBUTE_ModuleHeight,
-  XFA_ATTRIBUTE_TransferEncoding,
-  XFA_ATTRIBUTE_Usage,
-  XFA_ATTRIBUTE_Presence,
-  XFA_ATTRIBUTE_RadixOffset,
-  XFA_ATTRIBUTE_Preserve,
-  XFA_ATTRIBUTE_AliasNode,
-  XFA_ATTRIBUTE_MultiLine,
-  XFA_ATTRIBUTE_Version,
-  XFA_ATTRIBUTE_StartChar,
-  XFA_ATTRIBUTE_ScriptTest,
-  XFA_ATTRIBUTE_StartAngle,
-  XFA_ATTRIBUTE_CursorType,
-  XFA_ATTRIBUTE_DigitalSignature,
-  XFA_ATTRIBUTE_CodeType,
-  XFA_ATTRIBUTE_Output,
-  XFA_ATTRIBUTE_BookendTrailer,
-  XFA_ATTRIBUTE_ImagingBBox,
-  XFA_ATTRIBUTE_ExcludeInitialCap,
-  XFA_ATTRIBUTE_Force,
-  XFA_ATTRIBUTE_CrlSign,
-  XFA_ATTRIBUTE_Previous,
-  XFA_ATTRIBUTE_PushCharacterCount,
-  XFA_ATTRIBUTE_NullTest,
-  XFA_ATTRIBUTE_RunAt,
-  XFA_ATTRIBUTE_SpaceBelow,
-  XFA_ATTRIBUTE_SweepAngle,
-  XFA_ATTRIBUTE_NumberOfCells,
-  XFA_ATTRIBUTE_LetterSpacing,
-  XFA_ATTRIBUTE_LockType,
-  XFA_ATTRIBUTE_PasswordChar,
-  XFA_ATTRIBUTE_VAlign,
-  XFA_ATTRIBUTE_SourceBelow,
-  XFA_ATTRIBUTE_Inverted,
-  XFA_ATTRIBUTE_Mark,
-  XFA_ATTRIBUTE_MaxH,
-  XFA_ATTRIBUTE_MaxW,
-  XFA_ATTRIBUTE_Truncate,
-  XFA_ATTRIBUTE_MinH,
-  XFA_ATTRIBUTE_MinW,
-  XFA_ATTRIBUTE_Initial,
-  XFA_ATTRIBUTE_Mode,
-  XFA_ATTRIBUTE_Layout,
-  XFA_ATTRIBUTE_Server,
-  XFA_ATTRIBUTE_EmbedPDF,
-  XFA_ATTRIBUTE_OddOrEven,
-  XFA_ATTRIBUTE_TabDefault,
-  XFA_ATTRIBUTE_Contains,
-  XFA_ATTRIBUTE_RightInset,
-  XFA_ATTRIBUTE_MaxChars,
-  XFA_ATTRIBUTE_Open,
-  XFA_ATTRIBUTE_Relation,
-  XFA_ATTRIBUTE_WideNarrowRatio,
-  XFA_ATTRIBUTE_Relevant,
-  XFA_ATTRIBUTE_SignatureType,
-  XFA_ATTRIBUTE_LineThroughPeriod,
-  XFA_ATTRIBUTE_Shape,
-  XFA_ATTRIBUTE_TabStops,
-  XFA_ATTRIBUTE_OutputBelow,
-  XFA_ATTRIBUTE_Short,
-  XFA_ATTRIBUTE_FontVerticalScale,
-  XFA_ATTRIBUTE_Thickness,
-  XFA_ATTRIBUTE_CommitOn,
-  XFA_ATTRIBUTE_RemainCharacterCount,
-  XFA_ATTRIBUTE_KeyAgreement,
-  XFA_ATTRIBUTE_ErrorCorrectionLevel,
-  XFA_ATTRIBUTE_UpsMode,
-  XFA_ATTRIBUTE_MergeMode,
-  XFA_ATTRIBUTE_Circular,
-  XFA_ATTRIBUTE_PsName,
-  XFA_ATTRIBUTE_Trailer,
-  XFA_ATTRIBUTE_UnicodeRange,
-  XFA_ATTRIBUTE_ExecuteType,
-  XFA_ATTRIBUTE_DuplexImposition,
-  XFA_ATTRIBUTE_TrayIn,
-  XFA_ATTRIBUTE_BindingNode,
-  XFA_ATTRIBUTE_BofAction,
-  XFA_ATTRIBUTE_Save,
-  XFA_ATTRIBUTE_TargetType,
-  XFA_ATTRIBUTE_KeyEncipherment,
-  XFA_ATTRIBUTE_CredentialServerPolicy,
-  XFA_ATTRIBUTE_Size,
-  XFA_ATTRIBUTE_InitialNumber,
-  XFA_ATTRIBUTE_Slope,
-  XFA_ATTRIBUTE_CSpace,
-  XFA_ATTRIBUTE_ColSpan,
-  XFA_ATTRIBUTE_Binding,
-  XFA_ATTRIBUTE_Checksum,
-  XFA_ATTRIBUTE_CharEncoding,
-  XFA_ATTRIBUTE_Bind,
-  XFA_ATTRIBUTE_TextEntry,
-  XFA_ATTRIBUTE_Archive,
-  XFA_ATTRIBUTE_Uuid,
-  XFA_ATTRIBUTE_Posture,
-  XFA_ATTRIBUTE_After,
-  XFA_ATTRIBUTE_Orphans,
-  XFA_ATTRIBUTE_QualifiedName,
-  XFA_ATTRIBUTE_Usehref,
-  XFA_ATTRIBUTE_Locale,
-  XFA_ATTRIBUTE_Weight,
-  XFA_ATTRIBUTE_UnderlinePeriod,
-  XFA_ATTRIBUTE_Data,
-  XFA_ATTRIBUTE_Desc,
-  XFA_ATTRIBUTE_Numbered,
-  XFA_ATTRIBUTE_DataColumnCount,
-  XFA_ATTRIBUTE_Overline,
-  XFA_ATTRIBUTE_UrlPolicy,
-  XFA_ATTRIBUTE_AnchorType,
-  XFA_ATTRIBUTE_LabelRef,
-  XFA_ATTRIBUTE_BookendLeader,
-  XFA_ATTRIBUTE_MaxLength,
-  XFA_ATTRIBUTE_AccessKey,
-  XFA_ATTRIBUTE_CursorLocation,
-  XFA_ATTRIBUTE_DelayedOpen,
-  XFA_ATTRIBUTE_Target,
-  XFA_ATTRIBUTE_DataEncipherment,
-  XFA_ATTRIBUTE_AfterTarget,
-  XFA_ATTRIBUTE_Leader,
-  XFA_ATTRIBUTE_Picker,
-  XFA_ATTRIBUTE_From,
-  XFA_ATTRIBUTE_BaseProfile,
-  XFA_ATTRIBUTE_Aspect,
-  XFA_ATTRIBUTE_RowColumnRatio,
-  XFA_ATTRIBUTE_LineHeight,
-  XFA_ATTRIBUTE_Highlight,
-  XFA_ATTRIBUTE_ValueRef,
-  XFA_ATTRIBUTE_MaxEntries,
-  XFA_ATTRIBUTE_DataLength,
-  XFA_ATTRIBUTE_Activity,
-  XFA_ATTRIBUTE_Input,
-  XFA_ATTRIBUTE_Value,
-  XFA_ATTRIBUTE_BlankOrNotBlank,
-  XFA_ATTRIBUTE_AddRevocationInfo,
-  XFA_ATTRIBUTE_GenericFamily,
-  XFA_ATTRIBUTE_Hand,
-  XFA_ATTRIBUTE_Href,
-  XFA_ATTRIBUTE_TextEncoding,
-  XFA_ATTRIBUTE_LeadDigits,
-  XFA_ATTRIBUTE_Permissions,
-  XFA_ATTRIBUTE_SpaceAbove,
-  XFA_ATTRIBUTE_CodeBase,
-  XFA_ATTRIBUTE_Stock,
-  XFA_ATTRIBUTE_IsNull,
-  XFA_ATTRIBUTE_RestoreState,
-  XFA_ATTRIBUTE_ExcludeAllCaps,
-  XFA_ATTRIBUTE_FormatTest,
-  XFA_ATTRIBUTE_HScrollPolicy,
-  XFA_ATTRIBUTE_Join,
-  XFA_ATTRIBUTE_KeyCertSign,
-  XFA_ATTRIBUTE_Radius,
-  XFA_ATTRIBUTE_SourceAbove,
-  XFA_ATTRIBUTE_Override,
-  XFA_ATTRIBUTE_ClassId,
-  XFA_ATTRIBUTE_Disable,
-  XFA_ATTRIBUTE_Scope,
-  XFA_ATTRIBUTE_Match,
-  XFA_ATTRIBUTE_Placement,
-  XFA_ATTRIBUTE_Before,
-  XFA_ATTRIBUTE_WritingScript,
-  XFA_ATTRIBUTE_EndChar,
-  XFA_ATTRIBUTE_Lock,
-  XFA_ATTRIBUTE_Long,
-  XFA_ATTRIBUTE_Intact,
-  XFA_ATTRIBUTE_XdpContent,
-  XFA_ATTRIBUTE_DecipherOnly,
+enum class XFA_Attribute : uint8_t {
+  H = 0,
+  W,
+  X,
+  Y,
+  Id,
+  To,
+  LineThrough,
+  HAlign,
+  Typeface,
+  BeforeTarget,
+  Name,
+  Next,
+  DataRowCount,
+  Break,
+  VScrollPolicy,
+  FontHorizontalScale,
+  TextIndent,
+  Context,
+  TrayOut,
+  Cap,
+  Max,
+  Min,
+  Ref,
+  Rid,
+  Url,
+  Use,
+  LeftInset,
+  Widows,
+  Level,
+  BottomInset,
+  OverflowTarget,
+  AllowMacro,
+  PagePosition,
+  ColumnWidths,
+  OverflowLeader,
+  Action,
+  NonRepudiation,
+  Rate,
+  AllowRichText,
+  Role,
+  OverflowTrailer,
+  Operation,
+  Timeout,
+  TopInset,
+  Access,
+  CommandType,
+  Format,
+  DataPrep,
+  WidgetData,
+  Abbr,
+  MarginRight,
+  DataDescription,
+  EncipherOnly,
+  KerningMode,
+  Rotate,
+  WordCharacterCount,
+  Type,
+  Reserve,
+  TextLocation,
+  Priority,
+  Underline,
+  ModuleWidth,
+  Hyphenate,
+  Listen,
+  Delimiter,
+  ContentType,
+  StartNew,
+  EofAction,
+  AllowNeutral,
+  Connection,
+  BaselineShift,
+  OverlinePeriod,
+  FracDigits,
+  Orientation,
+  TimeStamp,
+  PrintCheckDigit,
+  MarginLeft,
+  Stroke,
+  ModuleHeight,
+  TransferEncoding,
+  Usage,
+  Presence,
+  RadixOffset,
+  Preserve,
+  AliasNode,
+  MultiLine,
+  Version,
+  StartChar,
+  ScriptTest,
+  StartAngle,
+  CursorType,
+  DigitalSignature,
+  CodeType,
+  Output,
+  BookendTrailer,
+  ImagingBBox,
+  ExcludeInitialCap,
+  Force,
+  CrlSign,
+  Previous,
+  PushCharacterCount,
+  NullTest,
+  RunAt,
+  SpaceBelow,
+  SweepAngle,
+  NumberOfCells,
+  LetterSpacing,
+  LockType,
+  PasswordChar,
+  VAlign,
+  SourceBelow,
+  Inverted,
+  Mark,
+  MaxH,
+  MaxW,
+  Truncate,
+  MinH,
+  MinW,
+  Initial,
+  Mode,
+  Layout,
+  Server,
+  EmbedPDF,
+  OddOrEven,
+  TabDefault,
+  Contains,
+  RightInset,
+  MaxChars,
+  Open,
+  Relation,
+  WideNarrowRatio,
+  Relevant,
+  SignatureType,
+  LineThroughPeriod,
+  Shape,
+  TabStops,
+  OutputBelow,
+  Short,
+  FontVerticalScale,
+  Thickness,
+  CommitOn,
+  RemainCharacterCount,
+  KeyAgreement,
+  ErrorCorrectionLevel,
+  UpsMode,
+  MergeMode,
+  Circular,
+  PsName,
+  Trailer,
+  UnicodeRange,
+  ExecuteType,
+  DuplexImposition,
+  TrayIn,
+  BindingNode,
+  BofAction,
+  Save,
+  TargetType,
+  KeyEncipherment,
+  CredentialServerPolicy,
+  Size,
+  InitialNumber,
+  Slope,
+  CSpace,
+  ColSpan,
+  Binding,
+  Checksum,
+  CharEncoding,
+  Bind,
+  TextEntry,
+  Archive,
+  Uuid,
+  Posture,
+  After,
+  Orphans,
+  QualifiedName,
+  Usehref,
+  Locale,
+  Weight,
+  UnderlinePeriod,
+  Data,
+  Desc,
+  Numbered,
+  DataColumnCount,
+  Overline,
+  UrlPolicy,
+  AnchorType,
+  LabelRef,
+  BookendLeader,
+  MaxLength,
+  AccessKey,
+  CursorLocation,
+  DelayedOpen,
+  Target,
+  DataEncipherment,
+  AfterTarget,
+  Leader,
+  Picker,
+  From,
+  BaseProfile,
+  Aspect,
+  RowColumnRatio,
+  LineHeight,
+  Highlight,
+  ValueRef,
+  MaxEntries,
+  DataLength,
+  Activity,
+  Input,
+  Value,
+  BlankOrNotBlank,
+  AddRevocationInfo,
+  GenericFamily,
+  Hand,
+  Href,
+  TextEncoding,
+  LeadDigits,
+  Permissions,
+  SpaceAbove,
+  CodeBase,
+  Stock,
+  IsNull,
+  RestoreState,
+  ExcludeAllCaps,
+  FormatTest,
+  HScrollPolicy,
+  Join,
+  KeyCertSign,
+  Radius,
+  SourceAbove,
+  Override,
+  ClassId,
+  Disable,
+  Scope,
+  Match,
+  Placement,
+  Before,
+  WritingScript,
+  EndChar,
+  Lock,
+  Long,
+  Intact,
+  XdpContent,
+  DecipherOnly,
+
+  Unknown = 255,
 };
 
 enum class XFA_Element : int32_t {
@@ -949,7 +950,7 @@ enum XFA_ATTRIBUTETYPE {
 struct XFA_ATTRIBUTEINFO {
   uint32_t uHash;
   const wchar_t* pName;
-  XFA_ATTRIBUTE eName;
+  XFA_Attribute eName;
   XFA_ATTRIBUTETYPE eType;
   uint32_t dwPackets;
   void* pDefValue;
@@ -997,7 +998,7 @@ enum XFA_UNIT {
 
 struct XFA_NOTSUREATTRIBUTE {
   XFA_Element eElement;
-  XFA_ATTRIBUTE attribute;
+  XFA_Attribute attribute;
   XFA_ATTRIBUTETYPE eType;
   void* pValue;
 };
@@ -1011,7 +1012,7 @@ struct XFA_METHODINFO {
 
 typedef void (CJX_Object::*XFA_ATTRIBUTE_CALLBACK)(CFXJSE_Value* pValue,
                                                    bool bSetting,
-                                                   XFA_ATTRIBUTE eAttribute);
+                                                   XFA_Attribute eAttribute);
 enum XFA_SCRIPT_TYPE {
   XFA_SCRIPT_Basic,
   XFA_SCRIPT_Object,
@@ -1021,7 +1022,7 @@ struct XFA_SCRIPTATTRIBUTEINFO {
   uint32_t uHash;
   const wchar_t* pName;
   XFA_ATTRIBUTE_CALLBACK callback;
-  XFA_ATTRIBUTE attribute;
+  XFA_Attribute attribute;
   uint16_t eValueType;
 };