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

Side by Side Diff: core/src/fpdfdoc/doc_formfield.cpp

Issue 1783023002: Re-enable MSVC warning 4800 for compiling with chromium_code (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "core/include/fpdfapi/cfdf_document.h" 7 #include "core/include/fpdfapi/cfdf_document.h"
8 #include "core/include/fpdfapi/cpdf_array.h" 8 #include "core/include/fpdfapi/cpdf_array.h"
9 #include "core/include/fpdfapi/cpdf_document.h" 9 #include "core/include/fpdfapi/cpdf_document.h"
10 #include "core/include/fpdfapi/cpdf_number.h" 10 #include "core/include/fpdfapi/cpdf_number.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 case CPDF_FormField::RadioButton: { 110 case CPDF_FormField::RadioButton: {
111 int iCount = CountControls(); 111 int iCount = CountControls();
112 if (iCount) { 112 if (iCount) {
113 if (PDF_FormField_IsUnison(this)) { 113 if (PDF_FormField_IsUnison(this)) {
114 for (int i = 0; i < iCount; i++) { 114 for (int i = 0; i < iCount; i++) {
115 CheckControl(i, GetControl(i)->IsDefaultChecked(), FALSE); 115 CheckControl(i, GetControl(i)->IsDefaultChecked(), FALSE);
116 } 116 }
117 } else { 117 } else {
118 for (int i = 0; i < iCount; i++) { 118 for (int i = 0; i < iCount; i++) {
119 CPDF_FormControl* pControl = GetControl(i); 119 CPDF_FormControl* pControl = GetControl(i);
120 FX_BOOL bChecked = pControl->IsDefaultChecked(); 120 bool bChecked = pControl->IsDefaultChecked();
121 CheckControl(i, bChecked, FALSE); 121 CheckControl(i, bChecked, FALSE);
Tom Sepez 2016/03/11 00:30:28 or just CheckControl(i, pControl->IsDefaultChecked
Wei Li 2016/03/11 04:11:36 Done.
122 } 122 }
123 } 123 }
124 } 124 }
125 if (bNotify && m_pForm->m_pFormNotify) { 125 if (bNotify && m_pForm->m_pFormNotify) {
126 m_pForm->m_pFormNotify->AfterCheckedStatusChange(this); 126 m_pForm->m_pFormNotify->AfterCheckedStatusChange(this);
127 } 127 }
128 } break; 128 } break;
129 case CPDF_FormField::ComboBox: { 129 case CPDF_FormField::ComboBox: {
130 CFX_WideString csValue; 130 CFX_WideString csValue;
131 ClearSelection(); 131 ClearSelection();
(...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 pFontDict = m_pForm->m_pFormDict->GetDictBy("DR") 1088 pFontDict = m_pForm->m_pFormDict->GetDictBy("DR")
1089 ->GetDictBy("Font") 1089 ->GetDictBy("Font")
1090 ->GetDictBy(font_name); 1090 ->GetDictBy(font_name);
1091 1091
1092 if (!pFontDict) { 1092 if (!pFontDict) {
1093 return; 1093 return;
1094 } 1094 }
1095 m_pFont = m_pForm->m_pDocument->LoadFont(pFontDict); 1095 m_pFont = m_pForm->m_pDocument->LoadFont(pFontDict);
1096 m_FontSize = FX_atof(syntax.GetWord()); 1096 m_FontSize = FX_atof(syntax.GetWord());
1097 } 1097 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698