Fix GetPageIndex() for dynamic XFA documents.

fpdfsdk/include/fsdk_mgr.h

Index: fpdfsdk/include/fsdk_mgr.h
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index bf11a23765845ac7c8758be5f513fce1b74227b8..84dea23b72298f39d8785bc392d85d799109e7b5 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -32,10 +32,6 @@ class CPDFSDK_PageView;
 class CPDFSDK_Widget;
 class IJS_Runtime;
 
-// NOTE: |bsUTF16LE| must outlive the use of the result. Care must be taken
-// since modifying the result would impact |bsUTF16LE|.
-FPDF_WIDESTRING AsFPDFWideString(CFX_ByteString* bsUTF16LE);

[Lei Zhang, 2016/06/08 07:33:56]

Never used outside.

-
 class CPDFDoc_Environment final {
  public:
   CPDFDoc_Environment(UnderlyingDocumentType* pDoc, FPDF_FORMFILLINFO* pFFinfo);
@@ -604,7 +600,7 @@ class CPDFSDK_PageView final : public CPDF_Page::View {
     return m_fxAnnotArray;
   }
 
-  int GetPageIndex();
+  int GetPageIndex() const;
   void LoadFXAnnots();
   void ClearFXAnnots();
   void SetValid(FX_BOOL bValid) { m_bValid = bValid; }
@@ -616,11 +612,10 @@ class CPDFSDK_PageView final : public CPDF_Page::View {
 #endif  // PDF_ENABLE_XFA
 
  private:
-  void PageView_OnHighlightFormFields(CFX_RenderDevice* pDevice,

[Lei Zhang, 2016/06/08 07:33:56]

No impl.

-                                      CPDFSDK_Widget* pWidget);
+  int GetPageIndexForStaticPDF() const;
 
   CFX_Matrix m_curMatrix;
-  UnderlyingPageType* m_page;
+  UnderlyingPageType* const m_page;
   std::unique_ptr<CPDF_AnnotList> m_pAnnotList;
   std::vector<CPDFSDK_Annot*> m_fxAnnotArray;
   CPDFSDK_Document* m_pSDKDoc;