summaryrefslogtreecommitdiff
path: root/xfa/fgas/xml
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fgas/xml')
-rw-r--r--xfa/fgas/xml/fgas_sax.h16
-rw-r--r--xfa/fgas/xml/fgas_sax_imp.h28
2 files changed, 22 insertions, 22 deletions
diff --git a/xfa/fgas/xml/fgas_sax.h b/xfa/fgas/xml/fgas_sax.h
index de5d91493d..501c358e0f 100644
--- a/xfa/fgas/xml/fgas_sax.h
+++ b/xfa/fgas/xml/fgas_sax.h
@@ -32,7 +32,7 @@ class IFX_SAXReaderHandler {
virtual ~IFX_SAXReaderHandler() {}
virtual void* OnTagEnter(const CFX_ByteStringC& bsTagName,
FX_SAXNODE eType,
- FX_DWORD dwStartPos) = 0;
+ uint32_t dwStartPos) = 0;
virtual void OnTagAttribute(void* pTag,
const CFX_ByteStringC& bsAttri,
const CFX_ByteStringC& bsValue) = 0;
@@ -40,15 +40,15 @@ class IFX_SAXReaderHandler {
virtual void OnTagData(void* pTag,
FX_SAXNODE eType,
const CFX_ByteStringC& bsData,
- FX_DWORD dwStartPos) = 0;
- virtual void OnTagClose(void* pTag, FX_DWORD dwEndPos) = 0;
+ uint32_t dwStartPos) = 0;
+ virtual void OnTagClose(void* pTag, uint32_t dwEndPos) = 0;
virtual void OnTagEnd(void* pTag,
const CFX_ByteStringC& bsTagName,
- FX_DWORD dwEndPos) = 0;
+ uint32_t dwEndPos) = 0;
virtual void OnTargetData(void* pTag,
FX_SAXNODE eType,
const CFX_ByteStringC& bsData,
- FX_DWORD dwStartPos) = 0;
+ uint32_t dwStartPos) = 0;
};
class IFX_SAXReader {
@@ -56,9 +56,9 @@ class IFX_SAXReader {
virtual ~IFX_SAXReader() {}
virtual void Release() = 0;
virtual int32_t StartParse(IFX_FileRead* pFile,
- FX_DWORD dwStart = 0,
- FX_DWORD dwLen = -1,
- FX_DWORD dwParseMode = 0) = 0;
+ uint32_t dwStart = 0,
+ uint32_t dwLen = -1,
+ uint32_t dwParseMode = 0) = 0;
virtual int32_t ContinueParse(IFX_Pause* pPause = NULL) = 0;
virtual void SkipCurrentNode() = 0;
virtual void SetHandler(IFX_SAXReaderHandler* pHandler) = 0;
diff --git a/xfa/fgas/xml/fgas_sax_imp.h b/xfa/fgas/xml/fgas_sax_imp.h
index 1d2161763f..a52d8356ee 100644
--- a/xfa/fgas/xml/fgas_sax_imp.h
+++ b/xfa/fgas/xml/fgas_sax_imp.h
@@ -12,16 +12,16 @@
class CFX_SAXFile {
public:
CFX_SAXFile();
- FX_BOOL StartFile(IFX_FileRead* pFile, FX_DWORD dwStart, FX_DWORD dwLen);
+ FX_BOOL StartFile(IFX_FileRead* pFile, uint32_t dwStart, uint32_t dwLen);
FX_BOOL ReadNextBlock();
void Reset();
IFX_FileRead* m_pFile;
- FX_DWORD m_dwStart;
- FX_DWORD m_dwEnd;
- FX_DWORD m_dwCur;
+ uint32_t m_dwStart;
+ uint32_t m_dwEnd;
+ uint32_t m_dwCur;
uint8_t* m_pBuf;
- FX_DWORD m_dwBufSize;
- FX_DWORD m_dwBufIndex;
+ uint32_t m_dwBufSize;
+ uint32_t m_dwBufIndex;
};
enum FX_SAXMODE {
@@ -53,7 +53,7 @@ class CFX_SAXItem {
m_pNext(NULL) {}
void* m_pNode;
FX_SAXNODE m_eNode;
- FX_DWORD m_dwID;
+ uint32_t m_dwID;
FX_BOOL m_bSkip;
CFX_SAXItem* m_pPrev;
CFX_SAXItem* m_pNext;
@@ -72,9 +72,9 @@ class CFX_SAXReader : public IFX_SAXReader {
~CFX_SAXReader();
virtual void Release() { delete this; }
virtual int32_t StartParse(IFX_FileRead* pFile,
- FX_DWORD dwStart = 0,
- FX_DWORD dwLen = -1,
- FX_DWORD dwParseMode = 0);
+ uint32_t dwStart = 0,
+ uint32_t dwLen = -1,
+ uint32_t dwParseMode = 0);
virtual int32_t ContinueParse(IFX_Pause* pPause = NULL);
virtual void SkipCurrentNode();
virtual void SetHandler(IFX_SAXReaderHandler* pHandler);
@@ -102,15 +102,15 @@ class CFX_SAXReader : public IFX_SAXReader {
int32_t m_iState;
CFX_SAXItem* m_pRoot;
CFX_SAXItem* m_pCurItem;
- FX_DWORD m_dwItemID;
+ uint32_t m_dwItemID;
FX_SAXMODE m_eMode;
FX_SAXMODE m_ePrevMode;
FX_BOOL m_bCharData;
uint8_t m_CurByte;
- FX_DWORD m_dwDataOffset;
+ uint32_t m_dwDataOffset;
CFX_ByteArray m_SkipStack;
uint8_t m_SkipChar;
- FX_DWORD m_dwNodePos;
+ uint32_t m_dwNodePos;
uint8_t* m_pszData;
int32_t m_iDataSize;
int32_t m_iDataLength;
@@ -119,7 +119,7 @@ class CFX_SAXReader : public IFX_SAXReader {
uint8_t* m_pszName;
int32_t m_iNameSize;
int32_t m_iNameLength;
- FX_DWORD m_dwParseMode;
+ uint32_t m_dwParseMode;
CFX_SAXCommentContext* m_pCommentContext;
void Reset();
void Push();