From 03f0fb0e650f134f31991b62e39c4d9a9d577560 Mon Sep 17 00:00:00 2001 From: Nicolas Pena Date: Wed, 19 Apr 2017 17:38:54 -0400 Subject: Remove the friends of CPDF_FormField Added some public methods so that CPDF_FormField has no friends. Change-Id: I179537e3c6ea64cedaca5365010c34c1ad702c40 Reviewed-on: https://pdfium-review.googlesource.com/4370 Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fpdfdoc/cpdf_formfield.h | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'core/fpdfdoc/cpdf_formfield.h') diff --git a/core/fpdfdoc/cpdf_formfield.h b/core/fpdfdoc/cpdf_formfield.h index 951d31c792..6ec7a5b414 100644 --- a/core/fpdfdoc/cpdf_formfield.h +++ b/core/fpdfdoc/cpdf_formfield.h @@ -7,6 +7,8 @@ #ifndef CORE_FPDFDOC_CPDF_FORMFIELD_H_ #define CORE_FPDFDOC_CPDF_FORMFIELD_H_ +#include +#include #include #include "core/fpdfdoc/cpdf_aaction.h" @@ -35,7 +37,7 @@ class CPDF_FormControl; class CPDF_InterForm; class CPDF_String; -CPDF_Object* FPDF_GetFieldAttr(CPDF_Dictionary* pFieldDict, +CPDF_Object* FPDF_GetFieldAttr(const CPDF_Dictionary* pFieldDict, const char* name, int nLevel = 0); CFX_WideString FPDF_GetFullName(CPDF_Dictionary* pFieldDict); @@ -131,10 +133,20 @@ class CPDF_FormField { float GetFontSize() const { return m_FontSize; } CPDF_Font* GetFont() const { return m_pFont; } - private: - friend class CPDF_InterForm; - friend class CPDF_FormControl; + const CPDF_Dictionary* GetDict() const { return m_pDict; } + const CPDF_InterForm* GetForm() const { return m_pForm; } + + CFX_WideString GetCheckValue(bool bDefault) const; + + void AddFormControl(CPDF_FormControl* pFormControl) { + m_ControlList.push_back(pFormControl); + } + void SetOpt(std::unique_ptr pOpt) { + m_pDict->SetFor("Opt", std::move(pOpt)); + } + + private: CFX_WideString GetValue(bool bDefault) const; bool SetValue(const CFX_WideString& value, bool bDefault, bool bNotify); @@ -143,7 +155,6 @@ class CPDF_FormField { CFX_WideString GetOptionText(int index, int sub_index) const; void LoadDA(); - CFX_WideString GetCheckValue(bool bDefault) const; bool SetCheckValue(const CFX_WideString& value, bool bDefault, bool bNotify); bool NotifyBeforeSelectionChange(const CFX_WideString& value); -- cgit v1.2.3