diff options
author | Tom Sepez <tsepez@chromium.org> | 2016-02-02 16:02:03 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2016-02-02 16:02:03 -0800 |
commit | ed5d7aa789ec5ef7b440d7e56b71804b41a928e3 (patch) | |
tree | 028bced4e1203313752240a1a3de7fbf998611c3 /core/src/fpdfdoc/doc_utils.h | |
parent | 23bf560507a8e03968e66480281597be9161abf4 (diff) | |
download | pdfium-ed5d7aa789ec5ef7b440d7e56b71804b41a928e3.tar.xz |
Merge to XFA: Kill CFX_ByteArray in master.
One trivial edit in fx_basic.h
Includes both fixes for build breakage.
Review URL: https://codereview.chromium.org/1653253002 .
(cherry picked from commit 9b0a59d659d8083802385649ba74370d65c41e36)
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1655423002 .
Diffstat (limited to 'core/src/fpdfdoc/doc_utils.h')
-rw-r--r-- | core/src/fpdfdoc/doc_utils.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/src/fpdfdoc/doc_utils.h b/core/src/fpdfdoc/doc_utils.h index 4a6652f9c6..58eee84380 100644 --- a/core/src/fpdfdoc/doc_utils.h +++ b/core/src/fpdfdoc/doc_utils.h @@ -7,6 +7,8 @@ #ifndef CORE_SRC_FPDFDOC_DOC_UTILS_H_ #define CORE_SRC_FPDFDOC_DOC_UTILS_H_ +#include <vector> + CFX_WideString GetFullName(CPDF_Dictionary* pFieldDict); void InitInterFormDict(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument); FX_DWORD CountInterFormFonts(CPDF_Dictionary* pFormDict); @@ -54,7 +56,7 @@ CPDF_Font* GetDefaultInterFormFont(CPDF_Dictionary* pFormDict, void SetDefaultInterFormFont(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument, const CPDF_Font* pFont); -void SaveCheckedFieldStatus(CPDF_FormField* pField, CFX_ByteArray& statusArray); +std::vector<bool> SaveCheckedFieldStatus(CPDF_FormField* pField); FX_BOOL NeedPDFEncodeForFieldFullName(const CFX_WideString& csFieldName); FX_BOOL NeedPDFEncodeForFieldTree(CPDF_Dictionary* pFieldDict, int nLevel = 0); void EncodeFieldName(const CFX_WideString& csName, CFX_ByteString& csT); |