Remove dead code from CPDF_InterForm.

core/fpdfdoc/include/cpdf_interform.h

Index: core/fpdfdoc/include/cpdf_interform.h
diff --git a/core/fpdfdoc/include/cpdf_interform.h b/core/fpdfdoc/include/cpdf_interform.h
index 6d9d616c895d841ed83adf7a94218712fe593234..358d2e484a9b0c535afea6d60088d33f1bef1c80 100644
--- a/core/fpdfdoc/include/cpdf_interform.h
+++ b/core/fpdfdoc/include/cpdf_interform.h
@@ -36,30 +36,21 @@ class CPDF_InterForm {
   explicit CPDF_InterForm(CPDF_Document* pDocument);
   ~CPDF_InterForm();
 
-  static void SetUpdateAP(FX_BOOL bUpdateAP);
-  static FX_BOOL IsUpdateAPEnabled();
+  static void SetUpdateAP(bool bUpdateAP);
+  static bool IsUpdateAPEnabled();
   static CFX_ByteString GenerateNewResourceName(const CPDF_Dictionary* pResDict,
                                                 const FX_CHAR* csType,
-                                                int iMinLen = 2,
-                                                const FX_CHAR* csPrefix = "");
+                                                int iMinLen,
+                                                const FX_CHAR* csPrefix);
   static CPDF_Font* AddStandardFont(CPDF_Document* pDocument,
                                     CFX_ByteString csFontName);
-  static CFX_ByteString GetNativeFont(uint8_t iCharSet,
-                                      void* pLogFont = nullptr);
-  static CFX_ByteString GetNativeFont(void* pLogFont = nullptr);
+  static CFX_ByteString GetNativeFont(uint8_t iCharSet, void* pLogFont);
   static uint8_t GetNativeCharSet();
   static CPDF_Font* AddNativeFont(uint8_t iCharSet, CPDF_Document* pDocument);
   static CPDF_Font* AddNativeFont(CPDF_Document* pDocument);
 
-  FX_BOOL ValidateFieldName(CFX_WideString& csNewFieldName, int iType);
-  FX_BOOL ValidateFieldName(const CPDF_FormField* pField,
-                            CFX_WideString& csNewFieldName);
-  FX_BOOL ValidateFieldName(const CPDF_FormControl* pControl,
-                            CFX_WideString& csNewFieldName);
-
-  uint32_t CountFields(const CFX_WideString& csFieldName = L"");
-  CPDF_FormField* GetField(uint32_t index,
-                           const CFX_WideString& csFieldName = L"");
+  size_t CountFields(const CFX_WideString& csFieldName);

[Tom Sepez, 2016/09/28 20:21:06]

nit: const method (this and the next one)?

[Lei Zhang, 2016/09/28 20:42:40]

Done, and a bit more.

+  CPDF_FormField* GetField(uint32_t index, const CFX_WideString& csFieldName);
   CPDF_FormField* GetFieldByDict(CPDF_Dictionary* pFieldDict) const;
 
   CPDF_FormControl* GetControlAtPoint(CPDF_Page* pPage,
@@ -68,39 +59,16 @@ class CPDF_InterForm {
                                       int* z_order) const;
   CPDF_FormControl* GetControlByDict(const CPDF_Dictionary* pWidgetDict) const;
 
-  CPDF_Document* GetDocument() const { return m_pDocument; }
-  CPDF_Dictionary* GetFormDict() const { return m_pFormDict; }
   FX_BOOL NeedConstructAP() const;
   int CountFieldsInCalculationOrder();
   CPDF_FormField* GetFieldInCalculationOrder(int index);
   int FindFieldInCalculationOrder(const CPDF_FormField* pField);
 
-  uint32_t CountFormFonts();
-  CPDF_Font* GetFormFont(uint32_t index, CFX_ByteString& csNameTag);
   CPDF_Font* GetFormFont(CFX_ByteString csNameTag);
-  CPDF_Font* GetFormFont(CFX_ByteString csFontName, CFX_ByteString& csNameTag);
-  CPDF_Font* GetNativeFormFont(uint8_t iCharSet, CFX_ByteString& csNameTag);
-  CPDF_Font* GetNativeFormFont(CFX_ByteString& csNameTag);
-  FX_BOOL FindFormFont(const CPDF_Font* pFont, CFX_ByteString& csNameTag);
   FX_BOOL FindFormFont(CFX_ByteString csFontName,
                        CPDF_Font*& pFont,
                        CFX_ByteString& csNameTag);
-
-  FX_BOOL FindFormFont(CFX_WideString csFontName,
-                       CPDF_Font*& pFont,
-                       CFX_ByteString& csNameTag) {
-    return FindFormFont(PDF_EncodeText(csFontName), pFont, csNameTag);
-  }
-
-  void AddFormFont(const CPDF_Font* pFont, CFX_ByteString& csNameTag);
-  CPDF_Font* AddNativeFormFont(uint8_t iCharSet, CFX_ByteString& csNameTag);
-  CPDF_Font* AddNativeFormFont(CFX_ByteString& csNameTag);
-
-  void RemoveFormFont(const CPDF_Font* pFont);
-  void RemoveFormFont(CFX_ByteString csNameTag);
-
   CPDF_DefaultAppearance GetDefaultAppearance();
-  CPDF_Font* GetDefaultFormFont();
   int GetFormAlignment();
 
   CPDF_FormField* CheckRequiredFields(
@@ -108,12 +76,11 @@ class CPDF_InterForm {
       bool bIncludeOrExclude) const;
 
   CFDF_Document* ExportToFDF(const CFX_WideStringC& pdf_path,
-                             bool bSimpleFileSpec = false) const;
+                             bool bSimpleFileSpec) const;
   CFDF_Document* ExportToFDF(const CFX_WideStringC& pdf_path,
                              const std::vector<CPDF_FormField*>& fields,
-                             bool bIncludeOrExclude = true,
-                             bool bSimpleFileSpec = false) const;
-  FX_BOOL ImportFromFDF(const CFDF_Document* pFDFDoc, FX_BOOL bNotify = FALSE);
+                             bool bIncludeOrExclude,
+                             bool bSimpleFileSpec) const;
 
   bool ResetForm(const std::vector<CPDF_FormField*>& fields,
                  bool bIncludeOrExclude = true,
@@ -129,7 +96,6 @@ class CPDF_InterForm {
   friend class CPDF_FormField;
 
   void LoadField(CPDF_Dictionary* pFieldDict, int nLevel = 0);
-  CPDF_Object* GetFieldAttr(CPDF_Dictionary* pFieldDict, const FX_CHAR* name);
   CPDF_FormField* AddTerminalField(CPDF_Dictionary* pFieldDict);
   CPDF_FormControl* AddControl(CPDF_FormField* pField,
                                CPDF_Dictionary* pWidgetDict);
@@ -143,10 +109,8 @@ class CPDF_InterForm {
                             const CPDF_FormControl* pExcludedControl);
   int CompareFieldName(const CFX_WideString& name1,
                        const CFX_WideString& name2);
-  int CompareFieldName(const CFX_ByteString& name1,
-                       const CFX_ByteString& name2);
 
-  static FX_BOOL s_bUpdateAP;
+  static bool s_bUpdateAP;
 
   CPDF_Document* const m_pDocument;
   CPDF_Dictionary* m_pFormDict;