From 97da97662417085774f75c26e535c6fbe70266ae Mon Sep 17 00:00:00 2001 From: Wei Li Date: Fri, 11 Mar 2016 17:00:48 -0800 Subject: Re-enable MSVC warning 4800 for compiling with chromium_code Mainly change the code to avoid the warnings; in a few cases we have to use explicit casts. BUG=pdfium:29 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1783023002 . --- fpdfsdk/src/javascript/Field.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/src/javascript/Field.cpp') diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp index 35ef8b42da..0c0dfd17bf 100644 --- a/fpdfsdk/src/javascript/Field.cpp +++ b/fpdfsdk/src/javascript/Field.cpp @@ -3022,7 +3022,7 @@ FX_BOOL Field::checkThisBox(IJS_Context* cc, int nWidget = params[0].ToInt(); - FX_BOOL bCheckit = TRUE; + bool bCheckit = true; if (iSize >= 2) bCheckit = params[1].ToBool(); @@ -3036,10 +3036,12 @@ FX_BOOL Field::checkThisBox(IJS_Context* cc, return FALSE; if (nWidget < 0 || nWidget >= pFormField->CountControls()) return FALSE; + // TODO(weili): Check whether anything special needed for radio button, + // otherwise merge these branches. if (pFormField->GetFieldType() == FIELDTYPE_RADIOBUTTON) - pFormField->CheckControl(nWidget, bCheckit, TRUE); + pFormField->CheckControl(nWidget, bCheckit, true); else - pFormField->CheckControl(nWidget, bCheckit, TRUE); + pFormField->CheckControl(nWidget, bCheckit, true); UpdateFormField(m_pDocument, pFormField, TRUE, TRUE, TRUE); return TRUE; -- cgit v1.2.3