From c46d0005880b24d38d9e7eab2f446e9724e93537 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 30 Nov 2015 15:46:36 -0800 Subject: Allow building non-XFA (master) on the XFA branch. This first pass is GYP-only, will do GN in the next CL. R=ochang@chromium.org Review URL: https://codereview.chromium.org/1480403002 . --- fpdfsdk/src/fsdk_mgr.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index 8bcf23147f..401da497f1 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -617,16 +617,14 @@ CPDFSDK_PageView::CPDFSDK_PageView(CPDFSDK_Document* pSDKDoc, : m_page(page), m_pSDKDoc(pSDKDoc), m_CaptureWidget(nullptr), +#ifndef PDF_ENABLE_XFA + m_bTakeOverPage(FALSE), +#endif // PDF_ENABLE_XFA m_bEnterWidget(FALSE), m_bExitWidget(FALSE), m_bOnWidget(FALSE), m_bValid(FALSE), -#ifdef PDF_ENABLE_XFA m_bLocked(FALSE) { -#else // PDF_ENABLE_XFA - m_bLocked(FALSE), - m_bTakeOverPage(FALSE) { -#endif // PDF_ENABLE_XFA CPDFSDK_InterForm* pInterForm = pSDKDoc->GetInterForm(); if (pInterForm) { CPDF_InterForm* pPDFInterForm = pInterForm->GetInterForm(); -- cgit v1.2.3