diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
commit | 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 (patch) | |
tree | e2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 /core/src/fpdfdoc/doc_form.cpp | |
parent | 63de95b699a4374982c2ddffced89e0da028fe4c (diff) | |
download | pdfium-6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33.tar.xz |
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
Diffstat (limited to 'core/src/fpdfdoc/doc_form.cpp')
-rw-r--r-- | core/src/fpdfdoc/doc_form.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; |