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

Side by Side Diff: fpdfsdk/formfiller/cffl_combobox.cpp

Issue 2031653003: Get rid of NULLs in fpdfsdk/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@nullptr_core
Patch Set: rebase Created 4 years, 6 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
« no previous file with comments | « fpdfsdk/formfiller/cba_fontmap.cpp ('k') | fpdfsdk/formfiller/cffl_formfiller.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "fpdfsdk/formfiller/cffl_combobox.h" 7 #include "fpdfsdk/formfiller/cffl_combobox.h"
8 8
9 #include "fpdfsdk/formfiller/cba_fontmap.h" 9 #include "fpdfsdk/formfiller/cba_fontmap.h"
10 #include "fpdfsdk/formfiller/cffl_formfiller.h" 10 #include "fpdfsdk/formfiller/cffl_formfiller.h"
11 #include "fpdfsdk/formfiller/cffl_iformfiller.h" 11 #include "fpdfsdk/formfiller/cffl_iformfiller.h"
12 #include "fpdfsdk/include/fsdk_common.h" 12 #include "fpdfsdk/include/fsdk_common.h"
13 #include "fpdfsdk/include/fsdk_mgr.h" 13 #include "fpdfsdk/include/fsdk_mgr.h"
14 #include "fpdfsdk/pdfwindow/PWL_ComboBox.h" 14 #include "fpdfsdk/pdfwindow/PWL_ComboBox.h"
15 15
16 CFFL_ComboBox::CFFL_ComboBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot) 16 CFFL_ComboBox::CFFL_ComboBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot)
17 : CFFL_FormFiller(pApp, pAnnot), m_pFontMap(NULL) { 17 : CFFL_FormFiller(pApp, pAnnot), m_pFontMap(nullptr) {
18 m_State.nIndex = 0; 18 m_State.nIndex = 0;
19 m_State.nStart = 0; 19 m_State.nStart = 0;
20 m_State.nEnd = 0; 20 m_State.nEnd = 0;
21 } 21 }
22 22
23 CFFL_ComboBox::~CFFL_ComboBox() { 23 CFFL_ComboBox::~CFFL_ComboBox() {
24 for (const auto& it : m_Maps) 24 for (const auto& it : m_Maps)
25 it.second->InvalidateFocusHandler(this); 25 it.second->InvalidateFocusHandler(this);
26 delete m_pFontMap; 26 delete m_pFontMap;
27 } 27 }
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 } 220 }
221 } 221 }
222 222
223 CPWL_Wnd* CFFL_ComboBox::ResetPDFWindow(CPDFSDK_PageView* pPageView, 223 CPWL_Wnd* CFFL_ComboBox::ResetPDFWindow(CPDFSDK_PageView* pPageView,
224 FX_BOOL bRestoreValue) { 224 FX_BOOL bRestoreValue) {
225 if (bRestoreValue) 225 if (bRestoreValue)
226 SaveState(pPageView); 226 SaveState(pPageView);
227 227
228 DestroyPDFWindow(pPageView); 228 DestroyPDFWindow(pPageView);
229 229
230 CPWL_Wnd* pRet = NULL; 230 CPWL_Wnd* pRet = nullptr;
231 231
232 if (bRestoreValue) { 232 if (bRestoreValue) {
233 RestoreState(pPageView); 233 RestoreState(pPageView);
234 pRet = GetPDFWindow(pPageView, FALSE); 234 pRet = GetPDFWindow(pPageView, FALSE);
235 } else { 235 } else {
236 pRet = GetPDFWindow(pPageView, TRUE); 236 pRet = GetPDFWindow(pPageView, TRUE);
237 } 237 }
238 238
239 m_pWidget->UpdateField(); 239 m_pWidget->UpdateField();
240 240
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 if (nExport >= 0) { 293 if (nExport >= 0) {
294 if (CPDF_FormField* pFormField = m_pWidget->GetFormField()) { 294 if (CPDF_FormField* pFormField = m_pWidget->GetFormField()) {
295 swRet = pFormField->GetOptionValue(nExport); 295 swRet = pFormField->GetOptionValue(nExport);
296 if (swRet.IsEmpty()) 296 if (swRet.IsEmpty())
297 swRet = pFormField->GetOptionLabel(nExport); 297 swRet = pFormField->GetOptionLabel(nExport);
298 } 298 }
299 } 299 }
300 300
301 return swRet; 301 return swRet;
302 } 302 }
OLDNEW
« no previous file with comments | « fpdfsdk/formfiller/cba_fontmap.cpp ('k') | fpdfsdk/formfiller/cffl_formfiller.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698