summaryrefslogtreecommitdiff
path: root/xfa/fxfa/include
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fxfa/include')
-rw-r--r--xfa/fxfa/include/xfa_checksum.h50
-rw-r--r--xfa/fxfa/include/xfa_ffapp.h2
-rw-r--r--xfa/fxfa/include/xfa_fontmgr.h3
3 files changed, 30 insertions, 25 deletions
diff --git a/xfa/fxfa/include/xfa_checksum.h b/xfa/fxfa/include/xfa_checksum.h
index 6c24b2a5af..6c7ea7a04c 100644
--- a/xfa/fxfa/include/xfa_checksum.h
+++ b/xfa/fxfa/include/xfa_checksum.h
@@ -16,37 +16,41 @@ class CXFA_ChecksumContext;
class CXFA_SAXContext {
public:
CXFA_SAXContext() : m_eNode(FX_SAXNODE_Unknown) {}
+
CFX_ByteTextBuf m_TextBuf;
CFX_ByteString m_bsTagName;
FX_SAXNODE m_eNode;
};
-class CXFA_SAXReaderHandler : public IFX_SAXReaderHandler {
+
+class CXFA_SAXReaderHandler {
public:
CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext);
- virtual ~CXFA_SAXReaderHandler();
- virtual void* OnTagEnter(const CFX_ByteStringC& bsTagName,
- FX_SAXNODE eType,
- uint32_t dwStartPos);
- virtual void OnTagAttribute(void* pTag,
- const CFX_ByteStringC& bsAttri,
- const CFX_ByteStringC& bsValue);
- virtual void OnTagBreak(void* pTag);
- virtual void OnTagData(void* pTag,
- FX_SAXNODE eType,
- const CFX_ByteStringC& bsData,
- uint32_t dwStartPos);
- virtual void OnTagClose(void* pTag, uint32_t dwEndPos);
- virtual void OnTagEnd(void* pTag,
- const CFX_ByteStringC& bsTagName,
- uint32_t dwEndPos);
+ ~CXFA_SAXReaderHandler();
- virtual void OnTargetData(void* pTag,
- FX_SAXNODE eType,
- const CFX_ByteStringC& bsData,
- uint32_t dwStartPos);
+ void* OnTagEnter(const CFX_ByteStringC& bsTagName,
+ FX_SAXNODE 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,
+ const CFX_ByteStringC& bsData,
+ uint32_t dwStartPos);
+ void OnTagClose(void* pTag, uint32_t dwEndPos);
+ void OnTagEnd(void* pTag,
+ const CFX_ByteStringC& bsTagName,
+ uint32_t dwEndPos);
+
+ void OnTargetData(void* pTag,
+ FX_SAXNODE eType,
+ const CFX_ByteStringC& bsData,
+ uint32_t dwStartPos);
protected:
void UpdateChecksum(FX_BOOL bCheckSpace);
+
CXFA_ChecksumContext* m_pContext;
CXFA_SAXContext m_SAXContext;
};
@@ -57,7 +61,7 @@ class CXFA_ChecksumContext {
~CXFA_ChecksumContext();
void Release() { delete this; }
- FX_BOOL StartChecksum();
+ void StartChecksum();
FX_BOOL UpdateChecksum(IFX_FileRead* pSrcFile,
FX_FILESIZE offset = 0,
size_t size = 0);
@@ -66,7 +70,7 @@ class CXFA_ChecksumContext {
void Update(const CFX_ByteStringC& bsText);
protected:
- IFX_SAXReader* m_pSAXReader;
+ CFX_SAXReader* m_pSAXReader;
uint8_t* m_pByteContext;
CFX_ByteString m_bsChecksum;
};
diff --git a/xfa/fxfa/include/xfa_ffapp.h b/xfa/fxfa/include/xfa_ffapp.h
index cad4e88e58..8ecc89df13 100644
--- a/xfa/fxfa/include/xfa_ffapp.h
+++ b/xfa/fxfa/include/xfa_ffapp.h
@@ -67,7 +67,7 @@ class CXFA_FFApp : public IFWL_AdapterNative {
IXFA_AppProvider* m_pProvider;
CXFA_FontMgr* m_pFontMgr;
#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
- IFX_FontSourceEnum* m_pFontSource;
+ CFX_FontSourceEnum_File* m_pFontSource;
#endif
CXFA_FWLAdapterWidgetMgr* m_pAdapterWidgetMgr;
IFWL_WidgetMgrDelegate* m_pWidgetMgrDelegate;
diff --git a/xfa/fxfa/include/xfa_fontmgr.h b/xfa/fxfa/include/xfa_fontmgr.h
index cab3cfb219..8b3e20f5e3 100644
--- a/xfa/fxfa/include/xfa_fontmgr.h
+++ b/xfa/fxfa/include/xfa_fontmgr.h
@@ -42,10 +42,11 @@ class CXFA_DefFontMgr {
CFX_PtrArray m_CacheFonts;
};
-class CXFA_PDFFontMgr : public IFX_FontProvider {
+class CXFA_PDFFontMgr {
public:
CXFA_PDFFontMgr(CXFA_FFDoc* pDoc);
~CXFA_PDFFontMgr();
+
IFX_Font* GetFont(const CFX_WideStringC& wsFontFamily,
uint32_t dwFontStyles,
CPDF_Font** pPDFFont,