diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-04-27 12:06:58 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-04-27 12:06:58 -0700 |
commit | 4f7bc04ed64edbf72f49b2189f85bb88f0b547c7 (patch) | |
tree | 708c0cc04028015e2860f07e8e60780b34137094 /fpdfsdk/src/formfiller/FFL_ListBox.cpp | |
parent | e5350eff5c5cfe4d01686a4c787d764bde5dd23c (diff) | |
download | pdfium-4f7bc04ed64edbf72f49b2189f85bb88f0b547c7.tar.xz |
Merge to XFA: Reduce usage of operator LPCWSTR from CFX_WideString().
Original Review URL: https://codereview.chromium.org/1101933003
TBR=brucedawson@chromium.org
Review URL: https://codereview.chromium.org/1108903002
Diffstat (limited to 'fpdfsdk/src/formfiller/FFL_ListBox.cpp')
-rw-r--r-- | fpdfsdk/src/formfiller/FFL_ListBox.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fpdfsdk/src/formfiller/FFL_ListBox.cpp b/fpdfsdk/src/formfiller/FFL_ListBox.cpp index 87ae552a66..dffd17538f 100644 --- a/fpdfsdk/src/formfiller/FFL_ListBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_ListBox.cpp @@ -76,11 +76,9 @@ CPWL_Wnd* CFFL_ListBox::NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView CFFL_IFormFiller* pIFormFiller = m_pApp->GetIFormFiller(); pWnd->SetFillerNotify(pIFormFiller); - ASSERT(m_pWidget != NULL); - for (FX_INT32 i=0,sz=m_pWidget->CountOptions(); i<sz; i++) - pWnd->AddString(m_pWidget->GetOptionLabel(i)); - + pWnd->AddString(m_pWidget->GetOptionLabel(i).c_str()); + if (pWnd->HasFlag(PLBS_MULTIPLESEL)) { m_OriginSelections.RemoveAll(); |