diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-05-30 18:11:51 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-30 18:11:51 +0000 |
| commit | d06cc38b76685b002c51b227ae43b8314d926ad8 (patch) | |
| tree | 89413c48e3de57f3e09043310598eaf219b78bca /fpdfsdk/fpdf_formfill.cpp | |
| parent | 0789714191b4b3109f7d5c415663090018e27577 (diff) | |
| download | pdfium-d06cc38b76685b002c51b227ae43b8314d926ad8.tar.xz | |
Make common page base class for XFA and non-XFA.
Now that both are ref-counted, we can replace ifdef's with some
polymorphism.
Bug: pdfium:760
Change-Id: Ie22ea259c9af56fa569f0af268b8e7065789a3f2
Reviewed-on: https://pdfium-review.googlesource.com/32892
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/fpdf_formfill.cpp')
| -rw-r--r-- | fpdfsdk/fpdf_formfill.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/fpdfsdk/fpdf_formfill.cpp b/fpdfsdk/fpdf_formfill.cpp index 62d2c00d55..c03b55b722 100644 --- a/fpdfsdk/fpdf_formfill.cpp +++ b/fpdfsdk/fpdf_formfill.cpp @@ -111,7 +111,7 @@ CPDFSDK_InterForm* FormHandleToInterForm(FPDF_FORMHANDLE hHandle) { CPDFSDK_PageView* FormHandleToPageView(FPDF_FORMHANDLE hHandle, FPDF_PAGE page) { - UnderlyingPageType* pPage = UnderlyingFromFPDFPage(page); + IPDF_Page* pPage = IPDFPageFromFPDFPage(page); if (!pPage) return nullptr; @@ -133,12 +133,13 @@ void FFLCommon(FPDF_FORMHANDLE hHandle, if (!hHandle) return; - UnderlyingPageType* pPage = UnderlyingFromFPDFPage(page); + IPDF_Page* pPage = IPDFPageFromFPDFPage(page); if (!pPage) return; #ifdef PDF_ENABLE_XFA - CPDF_Document::Extension* pExtension = pPage->GetDocumentExtension(); + CPDF_Document::Extension* pExtension = + pPage->AsXFAPage()->GetDocumentExtension(); if (!pExtension) return; CPDF_Document* pPDFDoc = pExtension->GetPDFDoc(); @@ -185,7 +186,7 @@ void FFLCommon(FPDF_FORMHANDLE hHandle, CPDFSDK_PageView* pPageView = pFormFillEnv->GetPageView(pPage, true); #else // PDF_ENABLE_XFA CPDFSDK_PageView* pPageView = - FormHandleToPageView(hHandle, FPDFPageFromUnderlying(pPage)); + FormHandleToPageView(hHandle, FPDFPageFromIPDFPage(pPage)); #endif // PDF_ENABLE_XFA if (pPageView) @@ -220,7 +221,7 @@ FPDFPage_HasFormFieldAtPoint(FPDF_FORMHANDLE hHandle, } #ifdef PDF_ENABLE_XFA - CPDFXFA_Page* pXFAPage = UnderlyingFromFPDFPage(page); + CPDFXFA_Page* pXFAPage = ToXFAPage(IPDFPageFromFPDFPage(page)); if (!pXFAPage) return -1; @@ -582,7 +583,7 @@ FPDF_EXPORT void FPDF_CALLCONV FORM_OnBeforeClosePage(FPDF_PAGE page, if (!pFormFillEnv) return; - UnderlyingPageType* pPage = UnderlyingFromFPDFPage(page); + IPDF_Page* pPage = IPDFPageFromFPDFPage(page); if (!pPage) return; @@ -640,7 +641,7 @@ FPDF_EXPORT void FPDF_CALLCONV FORM_DoPageAAction(FPDF_PAGE page, if (!pFormFillEnv) return; - UnderlyingPageType* pPage = UnderlyingFromFPDFPage(page); + IPDF_Page* pPage = IPDFPageFromFPDFPage(page); CPDF_Page* pPDFPage = CPDFPageFromFPDFPage(page); if (!pPDFPage) return; |