diff options
Diffstat (limited to 'xfa/fde/css/fde_cssstylesheet.h')
-rw-r--r-- | xfa/fde/css/fde_cssstylesheet.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/xfa/fde/css/fde_cssstylesheet.h b/xfa/fde/css/fde_cssstylesheet.h index 83eac993e7..d4781f8a8d 100644 --- a/xfa/fde/css/fde_cssstylesheet.h +++ b/xfa/fde/css/fde_cssstylesheet.h @@ -39,8 +39,6 @@ class CFDE_CSSSelector : public CFX_Target { CFDE_CSSSelector* m_pNext; }; -typedef CFX_ArrayTemplate<CFDE_CSSSelector*> CFDE_CSSSelectorArray; - class CFDE_CSSStyleRule : public IFDE_CSSStyleRule, public CFX_Target { public: CFDE_CSSStyleRule(); @@ -52,7 +50,7 @@ class CFDE_CSSStyleRule : public IFDE_CSSStyleRule, public CFX_Target { CFDE_CSSDeclaration& GetDeclImp() { return m_Declaration; } void SetSelector(IFX_MemoryAllocator* pStaticStore, - const CFDE_CSSSelectorArray& list); + const CFX_ArrayTemplate<CFDE_CSSSelector*>& list); protected: CFDE_CSSDeclaration m_Declaration; @@ -70,11 +68,11 @@ class CFDE_CSSMediaRule : public IFDE_CSSMediaRule, public CFX_Target { int32_t CountRules() const override; IFDE_CSSRule* GetRule(int32_t index) override; - CFDE_CSSRuleArray& GetArray() { return m_RuleArray; } + CFX_MassArrayTemplate<IFDE_CSSRule*>& GetArray() { return m_RuleArray; } protected: uint32_t m_dwMediaList; - CFDE_CSSRuleArray m_RuleArray; + CFX_MassArrayTemplate<IFDE_CSSRule*> m_RuleArray; }; class CFDE_CSSFontFaceRule : public IFDE_CSSFontFaceRule, public CFX_Target { @@ -122,21 +120,23 @@ class CFDE_CSSStyleSheet : public IFDE_CSSStyleSheet, public CFX_Target { protected: void Reset(); FX_BOOL LoadFromSyntax(CFDE_CSSSyntaxParser* pSyntax); - FDE_CSSSYNTAXSTATUS LoadStyleRule(CFDE_CSSSyntaxParser* pSyntax, - CFDE_CSSRuleArray& ruleArray); + FDE_CSSSYNTAXSTATUS LoadStyleRule( + CFDE_CSSSyntaxParser* pSyntax, + CFX_MassArrayTemplate<IFDE_CSSRule*>& ruleArray); FDE_CSSSYNTAXSTATUS LoadImportRule(CFDE_CSSSyntaxParser* pSyntax); FDE_CSSSYNTAXSTATUS LoadPageRule(CFDE_CSSSyntaxParser* pSyntax); FDE_CSSSYNTAXSTATUS LoadMediaRule(CFDE_CSSSyntaxParser* pSyntax); - FDE_CSSSYNTAXSTATUS LoadFontFaceRule(CFDE_CSSSyntaxParser* pSyntax, - CFDE_CSSRuleArray& ruleArray); + FDE_CSSSYNTAXSTATUS LoadFontFaceRule( + CFDE_CSSSyntaxParser* pSyntax, + CFX_MassArrayTemplate<IFDE_CSSRule*>& ruleArray); FDE_CSSSYNTAXSTATUS SkipRuleSet(CFDE_CSSSyntaxParser* pSyntax); uint16_t m_wCodePage; uint16_t m_wRefCount; uint32_t m_dwMediaList; IFX_MemoryAllocator* m_pAllocator; - CFDE_CSSRuleArray m_RuleArray; + CFX_MassArrayTemplate<IFDE_CSSRule*> m_RuleArray; CFX_WideString m_szUrl; - CFDE_CSSSelectorArray m_Selectors; + CFX_ArrayTemplate<CFDE_CSSSelector*> m_Selectors; std::unordered_map<uint32_t, FX_WCHAR*> m_StringCache; }; |