Cleanup CPDFXFA and CPDF document methods

fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h

Index: fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h
diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h
index 77597d47c22eae4953b55a6f693fa094aacfdf9b..5e5dbdc03a7178a697263abb8163f5e6331907fd 100644
--- a/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h
+++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h
@@ -38,16 +38,16 @@ class CPDFXFA_Document {
   CPDF_Document* GetPDFDoc() { return m_pPDFDoc.get(); }
   CXFA_FFDoc* GetXFADoc() { return m_pXFADoc.get(); }
   CXFA_FFDocView* GetXFADocView() { return m_pXFADocView; }
-
-  int GetPageCount();
-  CPDFXFA_Page* GetPage(int page_index);
-  CPDFXFA_Page* GetPage(CXFA_FFPageView* pPage);
+  CPDFSDK_Document* GetSDKDocument(CPDFSDK_Environment* pFormFillEnv);
+  int GetDocType() { return m_iDocType; }

[Tom Sepez, 2016/09/20 18:52:29]

nit: both of these are const?

[dsinclair, 2016/09/20 19:02:54]

GetSDKDocument can't be const as it may create the SDKDocument.

 
   void DeletePage(int page_index);
-  void RemovePage(CPDFXFA_Page* page);
-  int GetDocType() { return m_iDocType; }
+  int GetPageCount() const;
 
-  CPDFSDK_Document* GetSDKDocument(CPDFSDK_Environment* pFormFillEnv);
+  CPDFXFA_Page* GetXFAPage(int page_index);

[npm, 2016/09/20 14:30:25]

Why separate these?

[dsinclair, 2016/09/20 14:38:09]

Attempting to separate them from the methods that were going to be virtualized.

+  CPDFXFA_Page* GetXFAPage(CXFA_FFPageView* pPage);

[dsinclair, 2016/09/20 18:04:43]

Tom, I renamed these because there is a CPDF_Dictionary* GetPage(int page_index)
in CPDF_Document and, I believe, we can't overload on the return type, yea?

[Tom Sepez, 2016/09/20 18:52:29]

nit: these two too.

[dsinclair, 2016/09/20 19:02:53]

One of these can be, the other can't. The int version may create the page before
returning it. The non-int version just returns pages.

+
+  void RemovePage(CPDFXFA_Page* page);
 
   void ClearChangeMark();