Index: xfa/fxfa/include/xfa_checksum.h |
diff --git a/xfa/fxfa/include/xfa_checksum.h b/xfa/fxfa/include/xfa_checksum.h |
index f6b13e7cb7406d5e1d8e4bf6bf05f5fdcdca5566..a5e5592cec33f831fa298c060ff57c57fc4d8755 100644 |
--- a/xfa/fxfa/include/xfa_checksum.h |
+++ b/xfa/fxfa/include/xfa_checksum.h |
@@ -7,7 +7,7 @@ |
#ifndef XFA_FXFA_INCLUDE_XFA_CHECKSUM_H_ |
#define XFA_FXFA_INCLUDE_XFA_CHECKSUM_H_ |
-#include "xfa/fgas/xml/fgas_sax.h" |
+#include "xfa/fde/xml/cfx_saxreader.h" |
#include "xfa/fxfa/include/fxfa.h" |
class CXFA_SAXReaderHandler; |
@@ -15,11 +15,11 @@ class CXFA_ChecksumContext; |
class CXFA_SAXContext { |
public: |
- CXFA_SAXContext() : m_eNode(FX_SAXNODE_Unknown) {} |
+ CXFA_SAXContext() : m_eNode(CFX_SAXItem::Type::Unknown) {} |
CFX_ByteTextBuf m_TextBuf; |
CFX_ByteString m_bsTagName; |
- FX_SAXNODE m_eNode; |
+ CFX_SAXItem::Type m_eNode; |
}; |
class CXFA_SAXReaderHandler { |
@@ -28,14 +28,14 @@ class CXFA_SAXReaderHandler { |
~CXFA_SAXReaderHandler(); |
void* OnTagEnter(const CFX_ByteStringC& bsTagName, |
- FX_SAXNODE eType, |
+ CFX_SAXItem::Type eType, |
uint32_t dwStartPos); |
void OnTagAttribute(void* pTag, |
const CFX_ByteStringC& bsAttri, |
const CFX_ByteStringC& bsValue); |
void OnTagBreak(void* pTag); |
void OnTagData(void* pTag, |
- FX_SAXNODE eType, |
+ CFX_SAXItem::Type eType, |
const CFX_ByteStringC& bsData, |
uint32_t dwStartPos); |
void OnTagClose(void* pTag, uint32_t dwEndPos); |
@@ -44,7 +44,7 @@ class CXFA_SAXReaderHandler { |
uint32_t dwEndPos); |
void OnTargetData(void* pTag, |
- FX_SAXNODE eType, |
+ CFX_SAXItem::Type eType, |
const CFX_ByteStringC& bsData, |
uint32_t dwStartPos); |