Remove FX_DWORD from XFA, part 2

xfa/fxfa/parser/xfa_localevalue.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef XFA_FXFA_PARSER_XFA_LOCALEVALUE_H_
 #define XFA_FXFA_PARSER_XFA_LOCALEVALUE_H_
 
 #include "xfa/include/fxfa/fxfa_objectacc.h"
 
 class IFX_Locale;
 class CFX_Unitime;
 class CXFA_LocaleMgr;
 
 #define XFA_VT_NULL 0
 #define XFA_VT_BOOLEAN 1
 #define XFA_VT_INTEGER 2
 #define XFA_VT_DECIMAL 4
 #define XFA_VT_FLOAT 8
 #define XFA_VT_TEXT 16
 #define XFA_VT_DATE 32
 #define XFA_VT_TIME 64
 #define XFA_VT_DATETIME 128
 
 class CXFA_LocaleValue {
  public:
   CXFA_LocaleValue();
   CXFA_LocaleValue(const CXFA_LocaleValue& value);
-  CXFA_LocaleValue(FX_DWORD dwType, CXFA_LocaleMgr* pLocaleMgr);
-  CXFA_LocaleValue(FX_DWORD dwType,
+  CXFA_LocaleValue(uint32_t dwType, CXFA_LocaleMgr* pLocaleMgr);
+  CXFA_LocaleValue(uint32_t dwType,
                    const CFX_WideString& wsValue,
                    CXFA_LocaleMgr* pLocaleMgr);
-  CXFA_LocaleValue(FX_DWORD dwType,
+  CXFA_LocaleValue(uint32_t dwType,
                    const CFX_WideString& wsValue,
                    const CFX_WideString& wsFormat,
                    IFX_Locale* pLocale,
                    CXFA_LocaleMgr* pLocaleMgr);
   ~CXFA_LocaleValue();
   CXFA_LocaleValue& operator=(const CXFA_LocaleValue& value);
 
   FX_BOOL ValidateValue(const CFX_WideString& wsValue,
                         const CFX_WideString& wsPattern,
                         IFX_Locale* pLocale,
                         CFX_WideString* pMatchFormat = NULL);
   FX_BOOL FormatPatterns(CFX_WideString& wsResult,
                          const CFX_WideString& wsFormat,
                          IFX_Locale* pLocale,
                          XFA_VALUEPICTURE eValueType) const;
   FX_BOOL FormatSinglePattern(CFX_WideString& wsResult,
                               const CFX_WideString& wsFormat,
                               IFX_Locale* pLocale,
                               XFA_VALUEPICTURE eValueType) const;
   FX_BOOL ValidateCanonicalValue(const CFX_WideString& wsValue,
-                                 FX_DWORD dwVType);
+                                 uint32_t dwVType);
   FX_BOOL ValidateCanonicalDate(const CFX_WideString& wsDate,
                                 CFX_Unitime& unDate);
   FX_BOOL ValidateCanonicalTime(const CFX_WideString& wsTime);
   FX_BOOL ValidateCanonicalDateTime(const CFX_WideString& wsDateTime);
   void GetNumbericFormat(CFX_WideString& wsFormat,
                          int32_t nIntLen,
                          int32_t nDecLen,
                          FX_BOOL bSign = TRUE);
   FX_BOOL ValidateNumericTemp(CFX_WideString& wsNumeric,
                               CFX_WideString& wsFormat,
                               IFX_Locale* pLocale = NULL,
                               int32_t* pos = NULL);
 
   CFX_WideString GetValue() const;
-  FX_DWORD GetType() const;
-  void SetValue(const CFX_WideString& wsValue, FX_DWORD dwType);
+  uint32_t GetType() const;
+  void SetValue(const CFX_WideString& wsValue, uint32_t dwType);
   CFX_WideString GetText() const;
   FX_FLOAT GetNum() const;
   FX_DOUBLE GetDoubleNum() const;
   CFX_Unitime GetDate() const;
   CFX_Unitime GetTime() const;
   CFX_Unitime GetDateTime() const;
   FX_BOOL SetText(const CFX_WideString& wsText);
   FX_BOOL SetText(const CFX_WideString& wsText,
                   const CFX_WideString& wsFormat,
                   IFX_Locale* pLocale);
@@ skipping 16 matching lines @@
   bool IsNull() const { return m_dwType == XFA_VT_NULL; }
   FX_BOOL IsEmpty() const { return m_wsValue.IsEmpty(); }
   FX_BOOL IsValid() const { return m_bValid; }
 
  protected:
   FX_BOOL ParsePatternValue(const CFX_WideString& wsValue,
                             const CFX_WideString& wsPattern,
                             IFX_Locale* pLocale);
   CXFA_LocaleMgr* m_pLocaleMgr;
   CFX_WideString m_wsValue;
-  FX_DWORD m_dwType;
+  uint32_t m_dwType;
   FX_BOOL m_bValid;
 };
 
 #endif  // XFA_FXFA_PARSER_XFA_LOCALEVALUE_H_