diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-01-11 11:59:17 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-01-11 11:59:17 -0800 |
| commit | 375a86403b7fa8d17d7b142c270e2d8e33bb924f (patch) | |
| tree | 1db1ffddb2bbbcd429cd1d7954b1949bfa54e1ab /fpdfsdk/src/fxedit/fxet_edit.cpp | |
| parent | 492961df3011ccc25646eae12ac6e6dcfe7f26da (diff) | |
| download | pdfium-375a86403b7fa8d17d7b142c270e2d8e33bb924f.tar.xz | |
Merge to XFA: Switch most min/max macros to std::min/max.
Fix lint errors along the way.
R=tsepez@chromium.org
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1567343002 .
(cherry picked from commit 9adfbb0920a258e916003b1ee9515e97879db82a)
Review URL: https://codereview.chromium.org/1577503002 .
Diffstat (limited to 'fpdfsdk/src/fxedit/fxet_edit.cpp')
| -rw-r--r-- | fpdfsdk/src/fxedit/fxet_edit.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fpdfsdk/src/fxedit/fxet_edit.cpp b/fpdfsdk/src/fxedit/fxet_edit.cpp index c7abbf44bb..0e66b0e3b5 100644 --- a/fpdfsdk/src/fxedit/fxet_edit.cpp +++ b/fpdfsdk/src/fxedit/fxet_edit.cpp @@ -6,6 +6,8 @@ #include "fpdfsdk/include/fxedit/fxet_edit.h" +#include <algorithm> + #include "core/include/fpdfapi/fpdf_resource.h" #define FX_EDIT_UNDO_MAXITEM 10000 @@ -176,8 +178,7 @@ void CFX_Edit_Refresh::Analyse(int32_t nAlignment) { CPDF_Rect rcResult; FX_FLOAT fWidthDiff; - int32_t szMax = - FX_EDIT_MAX(m_OldLineRects.GetSize(), m_NewLineRects.GetSize()); + int32_t szMax = std::max(m_OldLineRects.GetSize(), m_NewLineRects.GetSize()); int32_t i = 0; while (i < szMax) { @@ -1726,7 +1727,7 @@ void CFX_Edit::SetContentChanged() { void CFX_Edit::SelectAll() { if (m_pVT->IsValid()) { - m_SelState = GetWholeWordRange(); + m_SelState = CFX_Edit_Select(GetWholeWordRange()); SetCaret(m_SelState.EndPos); ScrollToCaret(); |