From d3be111cac2bb20e1917b3fae2102e742bb7efdb Mon Sep 17 00:00:00 2001 From: thestig Date: Wed, 8 Jun 2016 06:11:20 -0700 Subject: Fix GetPageIndex() for dynamic XFA documents. BUG=614211 Review-Url: https://codereview.chromium.org/2045013004 --- fpdfsdk/include/fsdk_mgr.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'fpdfsdk/include/fsdk_mgr.h') diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index bf11a23765..84dea23b72 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); - 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, - CPDFSDK_Widget* pWidget); + int GetPageIndexForStaticPDF() const; CFX_Matrix m_curMatrix; - UnderlyingPageType* m_page; + UnderlyingPageType* const m_page; std::unique_ptr m_pAnnotList; std::vector m_fxAnnotArray; CPDFSDK_Document* m_pSDKDoc; -- cgit v1.2.3