Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/cpdfsdk_widget.h" | 12 #include "fpdfsdk/include/cpdfsdk_widget.h" |
| 13 #include "fpdfsdk/include/fsdk_common.h" | 13 #include "fpdfsdk/include/fsdk_common.h" |
| 14 #include "fpdfsdk/include/fsdk_mgr.h" | 14 #include "fpdfsdk/include/fsdk_mgr.h" |
| 15 #include "fpdfsdk/pdfwindow/PWL_ComboBox.h" | 15 #include "fpdfsdk/pdfwindow/PWL_ComboBox.h" |
| 16 | 16 |
| 17 CFFL_ComboBox::CFFL_ComboBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot) | 17 CFFL_ComboBox::CFFL_ComboBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot) |
| 18 : CFFL_FormFiller(pApp, pAnnot), m_pFontMap(nullptr) { | 18 : CFFL_FormFiller(pApp, pAnnot), m_pFontMap(nullptr) { |
| 19 m_State.nIndex = 0; | 19 m_State.nIndex = 0; |
| 20 m_State.nStart = 0; | 20 m_State.nStart = 0; |
| 21 m_State.nEnd = 0; | 21 m_State.nEnd = 0; |
| 22 } | 22 } |
| 23 | 23 |
| 24 CFFL_ComboBox::~CFFL_ComboBox() { | 24 CFFL_ComboBox::~CFFL_ComboBox() { |
| 25 for (const auto& it : m_Maps) | 25 for (const auto& it : m_Maps) |
| 26 it.second->InvalidateFocusHandler(this); | 26 it.second->InvalidateFocusHandler(this); |
| 27 | |
| 28 // The combo box must destroy the window before it frees the font map because | |
| 29 // when the window destroys the PWL_Edit the edit will update the selection | |
| 30 // which requires getting the font data from the font map. | |
| 31 // | |
| 32 // The font map should be stored somewhere more appropriate so it will live | |
| 33 // until the PWL_Edit is done with it. pdfium:566 | |
|
Wei Li
2016/08/22 19:26:56
Does this only happen to ComboBox? How about ListB
dsinclair
2016/08/22 19:32:08
It doesn't look like ListBox has this issue as it
| |
| 34 DestroyWindows(); | |
| 27 delete m_pFontMap; | 35 delete m_pFontMap; |
| 28 } | 36 } |
| 29 | 37 |
| 30 PWL_CREATEPARAM CFFL_ComboBox::GetCreateParam() { | 38 PWL_CREATEPARAM CFFL_ComboBox::GetCreateParam() { |
| 31 PWL_CREATEPARAM cp = CFFL_FormFiller::GetCreateParam(); | 39 PWL_CREATEPARAM cp = CFFL_FormFiller::GetCreateParam(); |
| 32 | 40 |
| 33 int nFlags = m_pWidget->GetFieldFlags(); | 41 int nFlags = m_pWidget->GetFieldFlags(); |
| 34 if (nFlags & FIELDFLAG_EDIT) { | 42 if (nFlags & FIELDFLAG_EDIT) { |
| 35 cp.dwFlags |= PCBS_ALLOWCUSTOMTEXT; | 43 cp.dwFlags |= PCBS_ALLOWCUSTOMTEXT; |
| 36 } | 44 } |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 284 if (nExport >= 0) { | 292 if (nExport >= 0) { |
| 285 if (CPDF_FormField* pFormField = m_pWidget->GetFormField()) { | 293 if (CPDF_FormField* pFormField = m_pWidget->GetFormField()) { |
| 286 swRet = pFormField->GetOptionValue(nExport); | 294 swRet = pFormField->GetOptionValue(nExport); |
| 287 if (swRet.IsEmpty()) | 295 if (swRet.IsEmpty()) |
| 288 swRet = pFormField->GetOptionLabel(nExport); | 296 swRet = pFormField->GetOptionLabel(nExport); |
| 289 } | 297 } |
| 290 } | 298 } |
| 291 | 299 |
| 292 return swRet; | 300 return swRet; |
| 293 } | 301 } |
| OLD | NEW |