summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authorDiana Gage <drgage@google.com>2017-07-21 11:33:18 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-07-21 22:11:19 +0000
commit22bf7a5f796155ee3d1a4ea32e237a6d2034996d (patch)
tree04820b859411e0d5c45cbb238ac8b8266df53ea4 /fpdfsdk
parent06ac9c95c25289e84de7b13ae6264ce5ecb3b1a5 (diff)
downloadpdfium-22bf7a5f796155ee3d1a4ea32e237a6d2034996d.tar.xz
Change Clear() to ClearSelection().
This CL renames Clear() in CPWL_EditCtrl, CPWL_ComboBox, and CFX_Edit to ClearSelection(), as this function's behavior is clearing text selection. Change-Id: Ia32f5347abc1960d7219684942df6a3fede9936c Reviewed-on: https://pdfium-review.googlesource.com/8611 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Diana Gage <drgage@google.com>
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/fxedit/fxet_edit.cpp5
-rw-r--r--fpdfsdk/fxedit/fxet_edit.h2
-rw-r--r--fpdfsdk/pdfwindow/cpwl_combo_box.cpp4
-rw-r--r--fpdfsdk/pdfwindow/cpwl_combo_box.h2
-rw-r--r--fpdfsdk/pdfwindow/cpwl_edit.cpp4
-rw-r--r--fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp8
-rw-r--r--fpdfsdk/pdfwindow/cpwl_edit_ctrl.h2
7 files changed, 14 insertions, 13 deletions
diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp
index d00b4d6a61..96868d03c1 100644
--- a/fpdfsdk/fxedit/fxet_edit.cpp
+++ b/fpdfsdk/fxedit/fxet_edit.cpp
@@ -884,7 +884,7 @@ bool CFX_Edit::Delete() {
return Delete(true, true);
}
-bool CFX_Edit::Clear() {
+bool CFX_Edit::ClearSelection() {
return Clear(true, true);
}
@@ -1736,9 +1736,10 @@ bool CFX_Edit::Clear(bool bAddUndo, bool bPaint) {
return false;
CPVT_WordRange range = m_SelState.ConvertToWordRange();
- if (bAddUndo && m_bEnableUndo)
+ if (bAddUndo && m_bEnableUndo) {
AddEditUndoItem(
pdfium::MakeUnique<CFXEU_Clear>(this, range, GetSelectedText()));
+ }
SelectNone();
SetCaret(m_pVT->DeleteWords(range));
diff --git a/fpdfsdk/fxedit/fxet_edit.h b/fpdfsdk/fxedit/fxet_edit.h
index fb64e0a401..bb5246226d 100644
--- a/fpdfsdk/fxedit/fxet_edit.h
+++ b/fpdfsdk/fxedit/fxet_edit.h
@@ -343,7 +343,7 @@ class CFX_Edit {
bool InsertReturn();
bool Backspace();
bool Delete();
- bool Clear();
+ bool ClearSelection();
bool InsertText(const CFX_WideString& sText, int32_t charset);
bool Redo();
bool Undo();
diff --git a/fpdfsdk/pdfwindow/cpwl_combo_box.cpp b/fpdfsdk/pdfwindow/cpwl_combo_box.cpp
index e5076332f6..484027eba2 100644
--- a/fpdfsdk/pdfwindow/cpwl_combo_box.cpp
+++ b/fpdfsdk/pdfwindow/cpwl_combo_box.cpp
@@ -227,9 +227,9 @@ void CPWL_ComboBox::GetEditSelection(int32_t& nStartChar,
m_pEdit->GetSelection(nStartChar, nEndChar);
}
-void CPWL_ComboBox::Clear() {
+void CPWL_ComboBox::ClearSelection() {
if (m_pEdit)
- m_pEdit->Clear();
+ m_pEdit->ClearSelection();
}
void CPWL_ComboBox::CreateChildWnd(const PWL_CREATEPARAM& cp) {
diff --git a/fpdfsdk/pdfwindow/cpwl_combo_box.h b/fpdfsdk/pdfwindow/cpwl_combo_box.h
index a38ffa785f..12c0fe9878 100644
--- a/fpdfsdk/pdfwindow/cpwl_combo_box.h
+++ b/fpdfsdk/pdfwindow/cpwl_combo_box.h
@@ -74,7 +74,7 @@ class CPWL_ComboBox : public CPWL_Wnd {
void SetEditSelection(int32_t nStartChar, int32_t nEndChar);
void GetEditSelection(int32_t& nStartChar, int32_t& nEndChar) const;
- void Clear();
+ void ClearSelection();
void SelectAll();
bool IsPopup() const;
diff --git a/fpdfsdk/pdfwindow/cpwl_edit.cpp b/fpdfsdk/pdfwindow/cpwl_edit.cpp
index ac1cfa94ba..89361b5835 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit.cpp
+++ b/fpdfsdk/pdfwindow/cpwl_edit.cpp
@@ -136,7 +136,7 @@ bool CPWL_Edit::CanCut() const {
void CPWL_Edit::CutText() {
if (!CanCut())
return;
- m_pEdit->Clear();
+ m_pEdit->ClearSelection();
}
void CPWL_Edit::OnCreated() {
@@ -430,7 +430,7 @@ void CPWL_Edit::SetLimitChar(int32_t nLimitChar) {
}
void CPWL_Edit::ReplaceSel(const CFX_WideString& wsText) {
- m_pEdit->Clear();
+ m_pEdit->ClearSelection();
m_pEdit->InsertText(wsText, FX_CHARSET_Default);
}
diff --git a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp b/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp
index 726218989a..7b90579a5f 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp
+++ b/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp
@@ -169,7 +169,7 @@ bool CPWL_EditCtrl::OnKeyDown(uint16_t nChar, uint32_t nFlag) {
return true;
case FWL_VKEY_Unknown:
if (!IsSHIFTpressed(nFlag))
- Clear();
+ ClearSelection();
else
CutText();
return true;
@@ -233,7 +233,7 @@ bool CPWL_EditCtrl::OnChar(uint16_t nChar, uint32_t nFlag) {
if (m_pEdit->IsSelected() && word == FWL_VKEY_Back)
word = FWL_VKEY_Unknown;
- Clear();
+ ClearSelection();
switch (word) {
case FWL_VKEY_Back:
@@ -342,9 +342,9 @@ void CPWL_EditCtrl::GetSelection(int32_t& nStartChar, int32_t& nEndChar) const {
m_pEdit->GetSelection(nStartChar, nEndChar);
}
-void CPWL_EditCtrl::Clear() {
+void CPWL_EditCtrl::ClearSelection() {
if (!IsReadOnly())
- m_pEdit->Clear();
+ m_pEdit->ClearSelection();
}
void CPWL_EditCtrl::SelectAll() {
diff --git a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.h b/fpdfsdk/pdfwindow/cpwl_edit_ctrl.h
index 04ec6e8a25..fca3bd8fe4 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.h
+++ b/fpdfsdk/pdfwindow/cpwl_edit_ctrl.h
@@ -28,7 +28,7 @@ class CPWL_EditCtrl : public CPWL_Wnd {
CFX_WideString GetText() const;
void SetSelection(int32_t nStartChar, int32_t nEndChar);
void GetSelection(int32_t& nStartChar, int32_t& nEndChar) const;
- void Clear();
+ void ClearSelection();
void SelectAll();
CFX_PointF GetScrollPos() const;