diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-10-13 15:49:36 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-10-13 15:49:36 -0700 |
commit | 468e5896007c7fe7bb283c0161d807a76f403308 (patch) | |
tree | ae287c896702c071e58766fd2643ab7a803c9a66 /fpdfsdk/src/fpdf_ext.cpp | |
parent | 3342090d65e852f3f37a8f04d3fbe3ff2467d05c (diff) | |
download | pdfium-468e5896007c7fe7bb283c0161d807a76f403308.tar.xz |
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 .
Diffstat (limited to 'fpdfsdk/src/fpdf_ext.cpp')
-rw-r--r-- | fpdfsdk/src/fpdf_ext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |