From deee3d2ee201d62e7ef41e7d8378d7f52e057a9c Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 25 Mar 2016 14:38:58 -0700 Subject: Remove FX_DWORD from XFA, part 2 Some headers were missed in the previous CL. Review URL: https://codereview.chromium.org/1835703002 --- xfa/fxfa/parser/xfa_basic_imp.h | 4 ++-- xfa/fxfa/parser/xfa_docdata.h | 2 +- xfa/fxfa/parser/xfa_doclayout.h | 2 +- xfa/fxfa/parser/xfa_document.h | 16 ++++++++-------- xfa/fxfa/parser/xfa_document_datamerger_imp.h | 2 +- xfa/fxfa/parser/xfa_document_serialize.h | 4 ++-- xfa/fxfa/parser/xfa_layout_appadapter.h | 2 +- xfa/fxfa/parser/xfa_localevalue.h | 14 +++++++------- xfa/fxfa/parser/xfa_object.h | 26 +++++++++++++------------- xfa/fxfa/parser/xfa_parser_imp.h | 2 +- xfa/fxfa/parser/xfa_script.h | 2 +- xfa/fxfa/parser/xfa_script_eventpseudomodel.h | 2 +- xfa/fxfa/parser/xfa_script_hostpseudomodel.h | 2 +- xfa/fxfa/parser/xfa_script_imp.h | 6 +++--- xfa/fxfa/parser/xfa_script_nodehelper.h | 4 ++-- xfa/fxfa/parser/xfa_script_resolveprocessor.h | 4 ++-- 16 files changed, 47 insertions(+), 47 deletions(-) (limited to 'xfa/fxfa/parser') diff --git a/xfa/fxfa/parser/xfa_basic_imp.h b/xfa/fxfa/parser/xfa_basic_imp.h index d0440face1..ac0f8692ee 100644 --- a/xfa/fxfa/parser/xfa_basic_imp.h +++ b/xfa/fxfa/parser/xfa_basic_imp.h @@ -27,7 +27,7 @@ class CXFA_WideTextRead : public IFX_Stream { virtual void Release(); virtual IFX_Stream* Retain(); - virtual FX_DWORD GetAccessModes() const; + virtual uint32_t GetAccessModes() const; virtual int32_t GetLength() const; virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset); virtual int32_t GetPosition(); @@ -54,7 +54,7 @@ class CXFA_WideTextRead : public IFX_Stream { virtual void Lock() {} virtual void Unlock() {} - virtual IFX_Stream* CreateSharedStream(FX_DWORD dwAccess, + virtual IFX_Stream* CreateSharedStream(uint32_t dwAccess, int32_t iOffset, int32_t iLength) { return NULL; diff --git a/xfa/fxfa/parser/xfa_docdata.h b/xfa/fxfa/parser/xfa_docdata.h index b3c3edd0cc..b57b8da552 100644 --- a/xfa/fxfa/parser/xfa_docdata.h +++ b/xfa/fxfa/parser/xfa_docdata.h @@ -22,7 +22,7 @@ class IXFA_PacketExport { virtual FX_BOOL Export(IFX_FileWrite* pWrite) = 0; virtual FX_BOOL Export(IFX_FileWrite* pWrite, CXFA_Node* pNode, - FX_DWORD dwFlag = 0, + uint32_t dwFlag = 0, const FX_CHAR* pChecksum = NULL) = 0; }; class IXFA_PacketImport { diff --git a/xfa/fxfa/parser/xfa_doclayout.h b/xfa/fxfa/parser/xfa_doclayout.h index bb44868a98..8558cd0992 100644 --- a/xfa/fxfa/parser/xfa_doclayout.h +++ b/xfa/fxfa/parser/xfa_doclayout.h @@ -90,7 +90,7 @@ class CXFA_ContentLayoutItem : public CXFA_LayoutItem { CXFA_ContentLayoutItem* m_pNext; CFX_PointF m_sPos; CFX_SizeF m_sSize; - FX_DWORD m_dwStatus; + uint32_t m_dwStatus; }; CXFA_ContainerLayoutItem* CXFA_LayoutItem::AsContainerLayoutItem() { diff --git a/xfa/fxfa/parser/xfa_document.h b/xfa/fxfa/parser/xfa_document.h index affe4001ba..5938f2da56 100644 --- a/xfa/fxfa/parser/xfa_document.h +++ b/xfa/fxfa/parser/xfa_document.h @@ -82,7 +82,7 @@ class IXFA_Notify { void* pParam3 = NULL, void* pParam4 = NULL) = 0; virtual void OnWidgetDataEvent(CXFA_WidgetData* pSender, - FX_DWORD dwEvent, + uint32_t dwEvent, void* pParam = NULL, void* pAdditional = NULL, void* pAdditional2 = NULL) = 0; @@ -123,7 +123,7 @@ class IXFA_Notify { class IXFA_ObjFactory { public: virtual ~IXFA_ObjFactory() {} - virtual CXFA_Node* CreateNode(FX_DWORD dwPacket, XFA_ELEMENT eElement) = 0; + virtual CXFA_Node* CreateNode(uint32_t dwPacket, XFA_ELEMENT eElement) = 0; virtual CXFA_Node* CreateNode(const XFA_PACKETINFO* pPacket, XFA_ELEMENT eElement) = 0; }; @@ -146,17 +146,17 @@ class CXFA_Document : public IXFA_ObjFactory { IXFA_Notify* GetNotify() const; void SetRoot(CXFA_Node* pNewRoot); CXFA_Object* GetXFAObject(const CFX_WideStringC& wsNodeName); - CXFA_Object* GetXFAObject(FX_DWORD wsNodeNameHash); + CXFA_Object* GetXFAObject(uint32_t wsNodeNameHash); void AddPurgeNode(CXFA_Node* pNode); FX_BOOL RemovePurgeNode(CXFA_Node* pNode); void PurgeNodes(); - bool HasFlag(FX_DWORD dwFlag) { return (m_dwDocFlags & dwFlag) == dwFlag; } - void SetFlag(FX_DWORD dwFlag, FX_BOOL bOn = TRUE); + bool HasFlag(uint32_t dwFlag) { return (m_dwDocFlags & dwFlag) == dwFlag; } + void SetFlag(uint32_t dwFlag, FX_BOOL bOn = TRUE); FX_BOOL IsInteractive(); XFA_VERSION GetCurVersionMode() { return m_eCurVersionMode; } XFA_VERSION RecognizeXFAVersionNumber(CFX_WideString& wsTemplateNS); CXFA_LocaleMgr* GetLocalMgr(); - virtual CXFA_Node* CreateNode(FX_DWORD dwPacket, XFA_ELEMENT eElement); + virtual CXFA_Node* CreateNode(uint32_t dwPacket, XFA_ELEMENT eElement); virtual CXFA_Node* CreateNode(const XFA_PACKETINFO* pPacket, XFA_ELEMENT eElement); void DoProtoMerge(); @@ -177,7 +177,7 @@ class CXFA_Document : public IXFA_ObjFactory { IXFA_ScriptContext* GetScriptContext(); void ClearLayoutData(); - CFX_MapPtrTemplate m_rgGlobalBinding; + CFX_MapPtrTemplate m_rgGlobalBinding; CXFA_NodeArray m_pPendingPageSet; protected: @@ -194,7 +194,7 @@ class CXFA_Document : public IXFA_ObjFactory { CScript_SignaturePseudoModel* m_pScriptSignature; CXFA_NodeSet m_rgPurgeNodes; XFA_VERSION m_eCurVersionMode; - FX_DWORD m_dwDocFlags; + uint32_t m_dwDocFlags; friend class CXFA_SimpleParser; }; diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.h b/xfa/fxfa/parser/xfa_document_datamerger_imp.h index a5583cb9b7..0749b73e47 100644 --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.h +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.h @@ -18,7 +18,7 @@ CXFA_Node* XFA_NodeMerge_CloneOrMergeContainer( CXFA_Node* XFA_DataMerge_FindDataScope(CXFA_Node* pParentFormNode); CXFA_Node* XFA_DataMerge_FindFormDOMInstance(CXFA_Document* pDocument, XFA_ELEMENT eClassID, - FX_DWORD dwNameHash, + uint32_t dwNameHash, CXFA_Node* pFormParent); #endif // XFA_FXFA_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_ diff --git a/xfa/fxfa/parser/xfa_document_serialize.h b/xfa/fxfa/parser/xfa_document_serialize.h index f9253fb980..f18e163a8d 100644 --- a/xfa/fxfa/parser/xfa_document_serialize.h +++ b/xfa/fxfa/parser/xfa_document_serialize.h @@ -26,13 +26,13 @@ class CXFA_DataExporter : public IXFA_PacketExport { virtual FX_BOOL Export(IFX_FileWrite* pWrite); virtual FX_BOOL Export(IFX_FileWrite* pWrite, CXFA_Node* pNode, - FX_DWORD dwFlag = 0, + uint32_t dwFlag = 0, const FX_CHAR* pChecksum = NULL); protected: FX_BOOL Export(IFX_Stream* pStream, CXFA_Node* pNode, - FX_DWORD dwFlag, + uint32_t dwFlag, const FX_CHAR* pChecksum); CXFA_Document* m_pDocument; }; diff --git a/xfa/fxfa/parser/xfa_layout_appadapter.h b/xfa/fxfa/parser/xfa_layout_appadapter.h index f20ee9b3fe..eb4a9631d6 100644 --- a/xfa/fxfa/parser/xfa_layout_appadapter.h +++ b/xfa/fxfa/parser/xfa_layout_appadapter.h @@ -71,7 +71,7 @@ class CXFA_TraverseStrategy_ContentLayoutItem { return (CXFA_ContentLayoutItem*)pLayoutItem->m_pParent; } }; -FX_DWORD XFA_GetRelevant(CXFA_Node* pFormItem, FX_DWORD dwParentRelvant); +uint32_t XFA_GetRelevant(CXFA_Node* pFormItem, uint32_t dwParentRelvant); void XFA_ReleaseLayoutItem(CXFA_LayoutItem* pLayoutItem); #endif // XFA_FXFA_PARSER_XFA_LAYOUT_APPADAPTER_H_ diff --git a/xfa/fxfa/parser/xfa_localevalue.h b/xfa/fxfa/parser/xfa_localevalue.h index 5906858f33..bd88b0c325 100644 --- a/xfa/fxfa/parser/xfa_localevalue.h +++ b/xfa/fxfa/parser/xfa_localevalue.h @@ -27,11 +27,11 @@ 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, @@ -52,7 +52,7 @@ class CXFA_LocaleValue { 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); @@ -67,8 +67,8 @@ class CXFA_LocaleValue { 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; @@ -105,7 +105,7 @@ class CXFA_LocaleValue { IFX_Locale* pLocale); CXFA_LocaleMgr* m_pLocaleMgr; CFX_WideString m_wsValue; - FX_DWORD m_dwType; + uint32_t m_dwType; FX_BOOL m_bValid; }; diff --git a/xfa/fxfa/parser/xfa_object.h b/xfa/fxfa/parser/xfa_object.h index e50d6ab46f..a41cf4af2a 100644 --- a/xfa/fxfa/parser/xfa_object.h +++ b/xfa/fxfa/parser/xfa_object.h @@ -41,9 +41,9 @@ enum XFA_OBJECTTYPE { }; class CXFA_Object { public: - CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags); + CXFA_Object(CXFA_Document* pDocument, uint32_t uFlags); CXFA_Document* GetDocument() const { return m_pDocument; } - FX_DWORD GetFlag() const { return m_uFlags; } + uint32_t GetFlag() const { return m_uFlags; } XFA_OBJECTTYPE GetObjectType() const { return (XFA_OBJECTTYPE)(m_uFlags & XFA_OBJECTTYPEMASK); } @@ -85,7 +85,7 @@ class CXFA_Object { protected: CXFA_Document* const m_pDocument; - FX_DWORD m_uFlags; + uint32_t m_uFlags; }; #define XFA_NODEFILTER_Children 0x01 @@ -131,9 +131,9 @@ struct XFA_MAPMODULEDATA { class CXFA_Node : public CXFA_Object { public: XFA_ELEMENT GetClassID() const { return (XFA_ELEMENT)m_eNodeClass; } - FX_DWORD GetPacketID() const { return m_ePacket; } - FX_BOOL HasFlag(FX_DWORD dwFlag) const; - void SetFlag(FX_DWORD dwFlag, FX_BOOL bOn = TRUE, FX_BOOL bNotify = TRUE); + uint32_t GetPacketID() const { return m_ePacket; } + FX_BOOL HasFlag(uint32_t dwFlag) const; + void SetFlag(uint32_t dwFlag, FX_BOOL bOn = TRUE, FX_BOOL bNotify = TRUE); FX_BOOL IsAttributeInXML(); FX_BOOL IsFormContainer() { return m_ePacket == XFA_XDPPACKET_Form && IsContainerNode(); @@ -142,7 +142,7 @@ class CXFA_Node : public CXFA_Object { IFDE_XMLNode* GetXMLMappingNode() const { return m_pXMLNode; } IFDE_XMLNode* CreateXMLMappingNode(); FX_BOOL IsNeedSavingXMLNode(); - FX_DWORD GetNameHash() const { return m_dwNameHash; } + uint32_t GetNameHash() const { return m_dwNameHash; } bool IsUnnamed() const { return m_dwNameHash == 0; } CXFA_Node* GetModelNode(); void UpdateNameHash(); @@ -268,12 +268,12 @@ class CXFA_Node : public CXFA_Object { CXFA_Node* GetNodeItem(XFA_NODEITEM eItem) const; CXFA_Node* GetNodeItem(XFA_NODEITEM eItem, XFA_OBJECTTYPE eType) const; int32_t GetNodeList(CXFA_NodeArray& nodes, - FX_DWORD dwTypeFilter = XFA_NODEFILTER_Children | + uint32_t dwTypeFilter = XFA_NODEFILTER_Children | XFA_NODEFILTER_Properties, XFA_ELEMENT eElementFilter = XFA_ELEMENT_UNKNOWN, int32_t iLevel = 1); CXFA_Node* CreateSamePacketNode(XFA_ELEMENT eElement, - FX_DWORD dwFlags = XFA_NODEFLAG_Initialized); + uint32_t dwFlags = XFA_NODEFLAG_Initialized); CXFA_Node* CloneTemplateToForm(FX_BOOL bRecursive); CXFA_Node* GetTemplateNode() const; void SetTemplateNode(CXFA_Node* pTemplateNode); @@ -289,9 +289,9 @@ class CXFA_Node : public CXFA_Object { FX_BOOL GetLocaleName(CFX_WideString& wsLocaleName); XFA_ATTRIBUTEENUM GetIntact(); CXFA_Node* GetFirstChildByName(const CFX_WideStringC& wsNodeName) const; - CXFA_Node* GetFirstChildByName(FX_DWORD dwNodeNameHash) const; + CXFA_Node* GetFirstChildByName(uint32_t dwNodeNameHash) const; CXFA_Node* GetFirstChildByClass(XFA_ELEMENT eNodeClass) const; - CXFA_Node* GetNextSameNameSibling(FX_DWORD dwNodeNameHash) const; + CXFA_Node* GetNextSameNameSibling(uint32_t dwNodeNameHash) const; CXFA_Node* GetNextSameNameSibling(const CFX_WideStringC& wsNodeName) const; CXFA_Node* GetNextSameClassSibling(XFA_ELEMENT eNodeClass) const; int32_t GetNodeSameNameIndex() const; @@ -304,7 +304,7 @@ class CXFA_Node : public CXFA_Object { void Script_TreeClass_ResolveNodes(CFXJSE_Arguments* pArguments); void Script_Som_ResolveNodeList(FXJSE_HVALUE hValue, CFX_WideString wsExpression, - FX_DWORD dwFlag, + uint32_t dwFlag, CXFA_Node* refNode = NULL); void Script_TreeClass_All(FXJSE_HVALUE hValue, FX_BOOL bSetting, @@ -641,7 +641,7 @@ class CXFA_Node : public CXFA_Object { IFDE_XMLNode* m_pXMLNode; XFA_ELEMENT m_eNodeClass; uint16_t m_ePacket; - FX_DWORD m_dwNameHash; + uint32_t m_dwNameHash; CXFA_Node* m_pAuxNode; XFA_MAPMODULEDATA* m_pMapModuleData; }; diff --git a/xfa/fxfa/parser/xfa_parser_imp.h b/xfa/fxfa/parser/xfa_parser_imp.h index f01ffa2123..6ef890857a 100644 --- a/xfa/fxfa/parser/xfa_parser_imp.h +++ b/xfa/fxfa/parser/xfa_parser_imp.h @@ -132,7 +132,7 @@ class CXFA_XMLParser : public IFDE_XMLParser { CXFA_XMLNodeStack m_NodeStack; CFX_WideString m_ws1; CFX_WideString m_ws2; - FX_DWORD m_dwStatus; + uint32_t m_dwStatus; }; #endif // XFA_FXFA_PARSER_XFA_PARSER_IMP_H_ diff --git a/xfa/fxfa/parser/xfa_script.h b/xfa/fxfa/parser/xfa_script.h index 6d8f3a0ed3..fb2960d09b 100644 --- a/xfa/fxfa/parser/xfa_script.h +++ b/xfa/fxfa/parser/xfa_script.h @@ -97,7 +97,7 @@ class IXFA_ScriptContext { virtual int32_t ResolveObjects(CXFA_Object* refNode, const CFX_WideStringC& wsExpression, XFA_RESOLVENODE_RS& resolveNodeRS, - FX_DWORD dwStyles = XFA_RESOLVENODE_Children, + uint32_t dwStyles = XFA_RESOLVENODE_Children, CXFA_Node* bindNode = NULL) = 0; virtual FXJSE_HVALUE GetJSValueFromMap(CXFA_Object* pObject) = 0; virtual void CacheList(CXFA_NodeList* pList) = 0; diff --git a/xfa/fxfa/parser/xfa_script_eventpseudomodel.h b/xfa/fxfa/parser/xfa_script_eventpseudomodel.h index 54f26b2b70..1c185f5462 100644 --- a/xfa/fxfa/parser/xfa_script_eventpseudomodel.h +++ b/xfa/fxfa/parser/xfa_script_eventpseudomodel.h @@ -90,7 +90,7 @@ class CScript_EventPseudoModel : public CXFA_OrdinaryObject { protected: void Script_EventPseudoModel_Property(FXJSE_HVALUE hValue, - FX_DWORD dwFlag, + uint32_t dwFlag, FX_BOOL bSetting); }; diff --git a/xfa/fxfa/parser/xfa_script_hostpseudomodel.h b/xfa/fxfa/parser/xfa_script_hostpseudomodel.h index 0f711b8948..5718074b2f 100644 --- a/xfa/fxfa/parser/xfa_script_hostpseudomodel.h +++ b/xfa/fxfa/parser/xfa_script_hostpseudomodel.h @@ -80,7 +80,7 @@ class CScript_HostPseudoModel : public CXFA_OrdinaryObject { protected: void Script_HostPseudoModel_LoadString(FXJSE_HVALUE hValue, IXFA_Notify* pNotify, - FX_DWORD dwFlag); + uint32_t dwFlag); FX_BOOL Script_HostPseudoModel_ValidateArgsForMsg( CFXJSE_Arguments* pArguments, int32_t iArgIndex, diff --git a/xfa/fxfa/parser/xfa_script_imp.h b/xfa/fxfa/parser/xfa_script_imp.h index ab225eb54d..237192e855 100644 --- a/xfa/fxfa/parser/xfa_script_imp.h +++ b/xfa/fxfa/parser/xfa_script_imp.h @@ -35,7 +35,7 @@ class CXFA_ScriptContext : public IXFA_ScriptContext { virtual int32_t ResolveObjects(CXFA_Object* refNode, const CFX_WideStringC& wsExpression, XFA_RESOLVENODE_RS& resolveNodeRS, - FX_DWORD dwStyles = XFA_RESOLVENODE_Children, + uint32_t dwStyles = XFA_RESOLVENODE_Children, CXFA_Node* bindNode = NULL); virtual FXJSE_HVALUE GetJSValueFromMap(CXFA_Object* pObject); virtual void CacheList(CXFA_NodeList* pList) { m_CacheListArray.Add(pList); } @@ -59,7 +59,7 @@ class CXFA_ScriptContext : public IXFA_ScriptContext { FX_BOOL QueryNodeByFlag(CXFA_Node* refNode, const CFX_WideStringC& propname, FXJSE_HVALUE hValue, - FX_DWORD dwFlag, + uint32_t dwFlag, FX_BOOL bSetting); FX_BOOL QueryVariableHValue(CXFA_Node* pScriptNode, const CFX_ByteStringC& szPropName, @@ -121,7 +121,7 @@ class CXFA_ScriptContext : public IXFA_ScriptContext { CXFA_ResolveProcessor* m_pResolveProcessor; XFA_HFM2JSCONTEXT m_hFM2JSContext; CXFA_Object* m_pThisObject; - FX_DWORD m_dwBuiltInInFlags; + uint32_t m_dwBuiltInInFlags; XFA_ATTRIBUTEENUM m_eRunAtType; }; diff --git a/xfa/fxfa/parser/xfa_script_nodehelper.h b/xfa/fxfa/parser/xfa_script_nodehelper.h index b52f681447..e90db585fc 100644 --- a/xfa/fxfa/parser/xfa_script_nodehelper.h +++ b/xfa/fxfa/parser/xfa_script_nodehelper.h @@ -29,13 +29,13 @@ class CXFA_NodeHelper { XFA_LOGIC_TYPE eLogicType = XFA_LOGIC_NoTransparent); int32_t XFA_NodeAcc_TraverseSiblings(CXFA_Node* parent, - FX_DWORD dNameHash, + uint32_t dNameHash, CXFA_NodeArray* pSiblings, XFA_LOGIC_TYPE eLogicType, FX_BOOL bIsClassName = FALSE, FX_BOOL bIsFindProperty = TRUE); int32_t XFA_NodeAcc_TraverseAnySiblings(CXFA_Node* parent, - FX_DWORD dNameHash, + uint32_t dNameHash, CXFA_NodeArray* pSiblings, FX_BOOL bIsClassName = FALSE); int32_t XFA_CountSiblings(CXFA_Node* pNode, diff --git a/xfa/fxfa/parser/xfa_script_resolveprocessor.h b/xfa/fxfa/parser/xfa_script_resolveprocessor.h index fa34a88038..ee0cd82b7c 100644 --- a/xfa/fxfa/parser/xfa_script_resolveprocessor.h +++ b/xfa/fxfa/parser/xfa_script_resolveprocessor.h @@ -35,7 +35,7 @@ class CXFA_ResolveNodesData { CFX_WideString m_wsCondition; int32_t m_nLevel; CXFA_ObjArray m_Nodes; - FX_DWORD m_dwStyles; + uint32_t m_dwStyles; const XFA_SCRIPTATTRIBUTEINFO* m_pScriptAttribute; XFA_RESOVENODE_RSTYPE m_dwFlag; }; @@ -67,7 +67,7 @@ class CXFA_ResolveProcessor { void XFA_ResolveNode_FilterCondition(CXFA_ResolveNodesData& rnd, CFX_WideString wsCondition); int32_t XFA_ResolveNodes_PopStack(CFX_Int32Array& stack); - void XFA_ResolveNodes_SetStylesForChild(FX_DWORD dwParentStyles, + void XFA_ResolveNodes_SetStylesForChild(uint32_t dwParentStyles, CXFA_ResolveNodesData& rnd); int32_t XFA_ResolveNode_SetResultCreateNode(XFA_RESOLVENODE_RS& resolveNodeRS, CFX_WideString& wsLastCondition); -- cgit v1.2.3