diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-04-24 16:28:07 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-25 00:07:29 +0000 |
| commit | ef002c85521278e3082517297cf60372d7751cb1 (patch) | |
| tree | be0148d89603262c1bf11f16621a1c43509759db /fpdfsdk/fxedit | |
| parent | 3684a151e76991bc67dd397cba66b0620cc38bae (diff) | |
| download | pdfium-ef002c85521278e3082517297cf60372d7751cb1.tar.xz | |
Use fx_extension.h utilities in more places.
Change-Id: Iba1aa793567e69acc3cc1acbd5b9a9f531c80b7a
Reviewed-on: https://pdfium-review.googlesource.com/4453
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fpdfsdk/fxedit')
| -rw-r--r-- | fpdfsdk/fxedit/fxet_list.cpp | 9 | ||||
| -rw-r--r-- | fpdfsdk/fxedit/fxet_list.h | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/fpdfsdk/fxedit/fxet_list.cpp b/fpdfsdk/fxedit/fxet_list.cpp index c10b6a205e..c8fef948af 100644 --- a/fpdfsdk/fxedit/fxet_list.cpp +++ b/fpdfsdk/fxedit/fxet_list.cpp @@ -10,6 +10,7 @@ #include <utility> #include "core/fpdfdoc/cpvt_word.h" +#include "core/fxcrt/fx_extension.h" #include "fpdfsdk/fxedit/fxet_edit.h" #include "fpdfsdk/pdfwindow/PWL_ListBox.h" #include "third_party/base/stl_util.h" @@ -638,12 +639,6 @@ int32_t CFX_ListCtrl::GetLastSelected() const { return -1; } -wchar_t CFX_ListCtrl::Toupper(wchar_t c) const { - if ((c >= 'a') && (c <= 'z')) - c = c - ('a' - 'A'); - return c; -} - int32_t CFX_ListCtrl::FindNext(int32_t nIndex, wchar_t nChar) const { int32_t nCircleIndex = nIndex; int32_t sz = pdfium::CollectionSize<int32_t>(m_ListItems); @@ -653,7 +648,7 @@ int32_t CFX_ListCtrl::FindNext(int32_t nIndex, wchar_t nChar) const { nCircleIndex = 0; if (CFX_ListItem* pListItem = m_ListItems[nCircleIndex].get()) { - if (Toupper(pListItem->GetFirstChar()) == Toupper(nChar)) + if (FXSYS_toupper(pListItem->GetFirstChar()) == FXSYS_toupper(nChar)) return nCircleIndex; } } diff --git a/fpdfsdk/fxedit/fxet_list.h b/fpdfsdk/fxedit/fxet_list.h index 50e43c9d2f..cd6e2ddeff 100644 --- a/fpdfsdk/fxedit/fxet_list.h +++ b/fpdfsdk/fxedit/fxet_list.h @@ -262,7 +262,6 @@ class CFX_ListCtrl : protected CFX_ListContainer { CFX_WideString GetItemText(int32_t nIndex) const; void SetItemSelect(int32_t nItemIndex, bool bSelected); int32_t GetLastSelected() const; - wchar_t Toupper(wchar_t c) const; CPWL_List_Notify* m_pNotify; bool m_bNotifyFlag; |