From 89e6562f31f2807fb6f077c569a086858dd2ccb7 Mon Sep 17 00:00:00 2001 From: Diana Gage Date: Thu, 20 Jul 2017 18:09:31 -0700 Subject: Change CFX_Edit::GetSelText() to CFX_Edit::GetSelectedText(). This CL renames the CFX_Edit::GetSelText() method so that it is more descriptive. Change-Id: I2086f7d036cd874aba1b7d7ec04d1cbb7e182d06 Reviewed-on: https://pdfium-review.googlesource.com/8612 Reviewed-by: Lei Zhang Commit-Queue: Lei Zhang --- fpdfsdk/fxedit/fxet_edit.cpp | 5 +++-- fpdfsdk/fxedit/fxet_edit.h | 2 +- fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp index a1ddc149e5..d00b4d6a61 100644 --- a/fpdfsdk/fxedit/fxet_edit.cpp +++ b/fpdfsdk/fxedit/fxet_edit.cpp @@ -843,7 +843,7 @@ CFX_WideString CFX_Edit::GetRangeText(const CPVT_WordRange& range) const { return swRet; } -CFX_WideString CFX_Edit::GetSelText() const { +CFX_WideString CFX_Edit::GetSelectedText() const { return GetRangeText(m_SelState.ConvertToWordRange()); } @@ -1737,7 +1737,8 @@ bool CFX_Edit::Clear(bool bAddUndo, bool bPaint) { CPVT_WordRange range = m_SelState.ConvertToWordRange(); if (bAddUndo && m_bEnableUndo) - AddEditUndoItem(pdfium::MakeUnique(this, range, GetSelText())); + AddEditUndoItem( + pdfium::MakeUnique(this, range, GetSelectedText())); SelectNone(); SetCaret(m_pVT->DeleteWords(range)); diff --git a/fpdfsdk/fxedit/fxet_edit.h b/fpdfsdk/fxedit/fxet_edit.h index 4ae03e2303..fb64e0a401 100644 --- a/fpdfsdk/fxedit/fxet_edit.h +++ b/fpdfsdk/fxedit/fxet_edit.h @@ -351,7 +351,7 @@ class CFX_Edit { CPVT_WordPlace SearchWordPlace(const CFX_PointF& point) const; int32_t GetCaret() const; CPVT_WordPlace GetCaretWordPlace() const; - CFX_WideString GetSelText() const; + CFX_WideString GetSelectedText() const; CFX_WideString GetText() const; float GetFontSize() const; uint16_t GetPasswordChar() const; diff --git a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp b/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp index 357b552330..726218989a 100644 --- a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp +++ b/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp @@ -54,7 +54,7 @@ void CPWL_EditCtrl::SetCursor() { CFX_WideString CPWL_EditCtrl::GetSelectedText() { if (m_pEdit) - return m_pEdit->GetSelText(); + return m_pEdit->GetSelectedText(); return CFX_WideString(); } -- cgit v1.2.3