From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: Merge to XFA: Kill CFX_Object. Not just a simple merge, but changes to remove CFX_Object from XFA. Original Review URL: https://codereview.chromium.org/1088733002 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1087053002 --- core/src/fpdfdoc/doc_form.cpp | 6 +++--- core/src/fpdfdoc/pdf_vt.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'core/src/fpdfdoc') diff --git a/core/src/fpdfdoc/doc_form.cpp b/core/src/fpdfdoc/doc_form.cpp index d695cb98ba..d8ca525f0a 100644 --- a/core/src/fpdfdoc/doc_form.cpp +++ b/core/src/fpdfdoc/doc_form.cpp @@ -29,7 +29,7 @@ FX_BOOL NeedPDFEncodeForFieldTree(CPDF_Dictionary* pFieldDict, int nLevel = 0) void EncodeFieldName(const CFX_WideString& csName, CFX_ByteString& csT); void UpdateEncodeFieldName(CPDF_Dictionary* pFieldDict, int nLevel = 0); const int nMaxRecursion = 32; -class _CFieldNameExtractor : public CFX_Object +class _CFieldNameExtractor { public: _CFieldNameExtractor(const CFX_WideString& full_name) @@ -54,10 +54,10 @@ protected: FX_LPCWSTR m_pEnd; FX_LPCWSTR m_pCur; }; -class CFieldTree : public CFX_Object +class CFieldTree { public: - struct _Node : public CFX_Object { + struct _Node { _Node *parent; CFX_PtrArray children; CFX_WideString short_name; diff --git a/core/src/fpdfdoc/pdf_vt.h b/core/src/fpdfdoc/pdf_vt.h index 8fc9c7c099..f910dfd372 100644 --- a/core/src/fpdfdoc/pdf_vt.h +++ b/core/src/fpdfdoc/pdf_vt.h @@ -136,7 +136,7 @@ struct CPVT_LineInfo { FX_FLOAT fLineAscent; FX_FLOAT fLineDescent; }; -struct CPVT_WordInfo : public CFX_Object { +struct CPVT_WordInfo { CPVT_WordInfo() : Word(0), nCharset(0), fWordX(0.0f), fWordY(0.0f), fWordTail(0.0f), nFontIndex(-1), pWordProps(NULL) { @@ -215,7 +215,7 @@ public: } } }; -class CLine : public CFX_Object +class CLine { public: CLine(); @@ -282,7 +282,7 @@ private: CPVT_ArrayTemplate m_Lines; FX_INT32 m_nTotal; }; -class CSection : public CFX_Object +class CSection { friend class CTypeset; public: @@ -400,7 +400,7 @@ private: CPDF_Rect m_rcPlate; CPVT_FloatRect m_rcContent; }; -class CPDF_VariableText : public IPDF_VariableText, public CFX_Object, private CPDF_EditContainer +class CPDF_VariableText : public IPDF_VariableText, private CPDF_EditContainer { friend class CTypeset; friend class CSection; @@ -613,7 +613,7 @@ private: IPDF_VariableText_Provider * m_pVTProvider; CPDF_VariableText_Iterator * m_pVTIterator; }; -class CPDF_VariableText_Iterator : public IPDF_VariableText_Iterator, public CFX_Object +class CPDF_VariableText_Iterator : public IPDF_VariableText_Iterator { public: CPDF_VariableText_Iterator(CPDF_VariableText * pVT); -- cgit v1.2.3