From 8e631772e34256ca2f3bb86a1e23cca34fe8d4fa Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 13 Jun 2018 21:26:56 +0000 Subject: Collapse some more xfa/non-xfa code in cpdfsdk annots. cpdfsdk_annot.cpp:315 and cpdfsdk_annot.cpp:338 are nearly identical, except that the #ifdef XFA code passed along the correct type from the argument. Prefer this behaviour even when non-XFA. Change-Id: Id4d5fbcc773ffd10746c4ddc77a571e818e5a957 Reviewed-on: https://pdfium-review.googlesource.com/35030 Reviewed-by: dsinclair Commit-Queue: Tom Sepez --- fpdfsdk/cpdfsdk_annot.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/cpdfsdk_annot.cpp') diff --git a/fpdfsdk/cpdfsdk_annot.cpp b/fpdfsdk/cpdfsdk_annot.cpp index 6c17628a33..cfd87b3255 100644 --- a/fpdfsdk/cpdfsdk_annot.cpp +++ b/fpdfsdk/cpdfsdk_annot.cpp @@ -75,10 +75,11 @@ CFX_FloatRect CPDFSDK_Annot::GetRect() const { IPDF_Page* CPDFSDK_Annot::GetPage() { #ifdef PDF_ENABLE_XFA - return GetPDFXFAPage(); -#else // PDF_ENABLE_XFA - return GetPDFPage(); + CPDFXFA_Page* pXFAPage = GetPDFXFAPage(); + if (pXFAPage) + return pXFAPage; #endif // PDF_ENABLE_XFA + return GetPDFPage(); } CPDF_Page* CPDFSDK_Annot::GetPDFPage() { -- cgit v1.2.3