Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(952)

Unified Diff: fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp

Issue 2449293002: Fix some bool/int mismatches. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
index 2a2bb3c48daadb994a2e903e8dcd907c7f43f9e0..a5efd50adb711a55fa7a04beff7c3329f3184f5e 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
@@ -919,7 +919,6 @@ FX_BOOL CPDFXFA_DocEnvironment::SubmitDataInternal(CXFA_FFDoc* hDoc,
return FALSE;
}
- FPDF_BOOL bRet = TRUE;
Tom Sepez 2016/10/25 23:08:45 note: they mean FX_BOOL, not the other kind.
npm 2016/10/26 14:33:00 Aren't they both the same (int)?
Tom Sepez 2016/10/26 15:45:09 Yes, and that would be an obstacle to converting F
FPDF_FILEHANDLER* pFileHandler = nullptr;
int fileFlag = -1;
switch (submit.GetSubmitFormat()) {
@@ -966,11 +965,10 @@ FX_BOOL CPDFXFA_DocEnvironment::SubmitDataInternal(CXFA_FFDoc* hDoc,
CFX_WideString csBCCAddress;
CFX_WideString csSubject;
CFX_WideString csMsg;
- bRet = MailToInfo(csURL, csToAddress, csCCAddress, csBCCAddress, csSubject,
- csMsg);
- if (!bRet)
+ if (!MailToInfo(csURL, csToAddress, csCCAddress, csBCCAddress, csSubject,
+ csMsg)) {
return FALSE;
-
+ }
CFX_ByteString bsTo = CFX_WideString(csToAddress).UTF16LE_Encode();
CFX_ByteString bsCC = CFX_WideString(csCCAddress).UTF16LE_Encode();
CFX_ByteString bsBcc = CFX_WideString(csBCCAddress).UTF16LE_Encode();
@@ -997,7 +995,7 @@ FX_BOOL CPDFXFA_DocEnvironment::SubmitDataInternal(CXFA_FFDoc* hDoc,
(FPDF_WIDESTRING)bs.GetBuffer(len));
bs.ReleaseBuffer(len);
}
- return bRet;
+ return TRUE;
}
FX_BOOL CPDFXFA_DocEnvironment::SetGlobalProperty(
« core/fpdfapi/render/fpdf_render_loadimage.cpp ('K') | « core/fpdftext/cpdf_textpagefind.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698