1 files changed, 12 insertions, 12 deletions

diff --git a/xfa/fde/css/fde_cssdeclaration.h b/xfa/fde/css/fde_cssdeclaration.h
index 8db6d7b6a1..2dbd7a0622 100644
--- a/xfa/fde/css/fde_cssdeclaration.h
+++ b/xfa/fde/css/fde_cssdeclaration.h
@@ -15,7 +15,7 @@ class FDE_CSSPropertyHolder {
  public:
   FDE_CSSProperty eProperty;
   bool bImportant;
-  IFDE_CSSValue* pValue;
+  CFDE_CSSValue* pValue;
   FDE_CSSPropertyHolder* pNext;
 };
 
@@ -39,11 +39,11 @@ class CFDE_CSSDeclaration {
         m_pFirstCustom(nullptr),
         m_pLastCustom(nullptr) {}
 
-  IFDE_CSSValue* GetProperty(FDE_CSSProperty eProperty, bool& bImportant) const;
+  CFDE_CSSValue* GetProperty(FDE_CSSProperty eProperty, bool& bImportant) const;
   FX_POSITION GetStartPosition() const;
   void GetNextProperty(FX_POSITION& pos,
                        FDE_CSSProperty& eProperty,
-                       IFDE_CSSValue*& pValue,
+                       CFDE_CSSValue*& pValue,
                        bool& bImportant) const;
   FX_POSITION GetStartCustom() const;
   void GetNextCustom(FX_POSITION& pos,
@@ -65,40 +65,40 @@ class CFDE_CSSDeclaration {
                          bool bImportant);
   bool ParseBorderProperty(const FX_WCHAR* pszValue,
                            int32_t iValueLen,
-                           IFDE_CSSValue*& pWidth) const;
+                           CFDE_CSSValue*& pWidth) const;
   bool ParseValueListProperty(const FDE_CSSPropertyArgs* pArgs,
                               const FX_WCHAR* pszValue,
                               int32_t iValueLen,
                               bool bImportant);
-  bool Add4ValuesProperty(const CFDE_CSSValueArray& list,
+  bool Add4ValuesProperty(const CFX_ArrayTemplate<CFDE_CSSValue*>& list,
                           bool bImportant,
                           FDE_CSSProperty eLeft,
                           FDE_CSSProperty eTop,
                           FDE_CSSProperty eRight,
                           FDE_CSSProperty eBottom);
-  IFDE_CSSValue* ParseNumber(const FDE_CSSPropertyArgs* pArgs,
+  CFDE_CSSValue* ParseNumber(const FDE_CSSPropertyArgs* pArgs,
                              const FX_WCHAR* pszValue,
                              int32_t iValueLen);
-  IFDE_CSSValue* ParseEnum(const FDE_CSSPropertyArgs* pArgs,
+  CFDE_CSSValue* ParseEnum(const FDE_CSSPropertyArgs* pArgs,
                            const FX_WCHAR* pszValue,
                            int32_t iValueLen);
-  IFDE_CSSValue* ParseColor(const FDE_CSSPropertyArgs* pArgs,
+  CFDE_CSSValue* ParseColor(const FDE_CSSPropertyArgs* pArgs,
                             const FX_WCHAR* pszValue,
                             int32_t iValueLen);
-  IFDE_CSSValue* ParseURI(const FDE_CSSPropertyArgs* pArgs,
+  CFDE_CSSValue* ParseURI(const FDE_CSSPropertyArgs* pArgs,
                           const FX_WCHAR* pszValue,
                           int32_t iValueLen);
-  IFDE_CSSValue* ParseString(const FDE_CSSPropertyArgs* pArgs,
+  CFDE_CSSValue* ParseString(const FDE_CSSPropertyArgs* pArgs,
                              const FX_WCHAR* pszValue,
                              int32_t iValueLen);
-  IFDE_CSSValue* ParseFunction(const FDE_CSSPropertyArgs* pArgs,
+  CFDE_CSSValue* ParseFunction(const FDE_CSSPropertyArgs* pArgs,
                                const FX_WCHAR* pszValue,
                                int32_t iValueLen);
   const FX_WCHAR* CopyToLocal(const FDE_CSSPropertyArgs* pArgs,
                               const FX_WCHAR* pszValue,
                               int32_t iValueLen);
   void AddPropertyHolder(FDE_CSSProperty eProperty,
-                         IFDE_CSSValue* pValue,
+                         CFDE_CSSValue* pValue,
                          bool bImportant);
   CFDE_CSSPrimitiveValue* NewNumberValue(FDE_CSSPrimitiveType eUnit,
                                          FX_FLOAT fValue) const;