From 468e5896007c7fe7bb283c0161d807a76f403308 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 13 Oct 2015 15:49:36 -0700 Subject: Changes to XFA to more closely match master. These files should change in XFA in order to reduce the number of "noise diffs" between master and XFA as seen in https://codereview.chromium.org/1399273003/ These include: blank lines and missed merges: 3c012fe else-after-returns (partial) fb07e28 Tidy up CPDFDOC_Environment (partial, consts missing). 624b166 Allow FPDFBookmark_GetFirstChild to return the top level bookmark R=thestig@chromium.org Review URL: https://codereview.chromium.org/1403063003 . --- fpdfsdk/src/fpdf_ext.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'fpdfsdk/src/fpdf_ext.cpp') diff --git a/fpdfsdk/src/fpdf_ext.cpp b/fpdfsdk/src/fpdf_ext.cpp index 210c28dc43..f68a45f119 100644 --- a/fpdfsdk/src/fpdf_ext.cpp +++ b/fpdfsdk/src/fpdf_ext.cpp @@ -151,7 +151,8 @@ void CheckUnSupportError(CPDF_Document* pDoc, FX_DWORD err_code) { if (pNameDict && pNameDict->KeyExist("EmbeddedFiles")) { FPDF_UnSupportError(FPDF_UNSP_DOC_ATTACHMENT); return; - } else if (pNameDict && pNameDict->KeyExist("JavaScript")) { + } + if (pNameDict && pNameDict->KeyExist("JavaScript")) { CPDF_Dictionary* pJSDict = pNameDict->GetDict("JavaScript"); CPDF_Array* pArray = pJSDict ? pJSDict->GetArray("Names") : NULL; if (pArray) { -- cgit v1.2.3