Remove bool bPaint argument from CPWL_EditImpl methods.
It is always passed as true.
Change-Id: I7c7d536cba0415d5613c0fdf817efbb38957ab67
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/79410
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/fpdfsdk/pwl/cpwl_edit_impl.cpp b/fpdfsdk/pwl/cpwl_edit_impl.cpp
index ec5499c..7dbed9c 100644
--- a/fpdfsdk/pwl/cpwl_edit_impl.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_impl.cpp
@@ -242,14 +242,14 @@
int CFXEU_InsertWord::Redo() {
m_pEdit->SelectNone();
m_pEdit->SetCaret(m_wpOld);
- m_pEdit->InsertWord(m_Word, m_nCharset, false, true);
+ m_pEdit->InsertWord(m_Word, m_nCharset, false);
return 0;
}
int CFXEU_InsertWord::Undo() {
m_pEdit->SelectNone();
m_pEdit->SetCaret(m_wpNew);
- m_pEdit->Backspace(false, true);
+ m_pEdit->Backspace(false);
return 0;
}
@@ -265,14 +265,14 @@
int CFXEU_InsertReturn::Redo() {
m_pEdit->SelectNone();
m_pEdit->SetCaret(m_wpOld);
- m_pEdit->InsertReturn(false, true);
+ m_pEdit->InsertReturn(false);
return 0;
}
int CFXEU_InsertReturn::Undo() {
m_pEdit->SelectNone();
m_pEdit->SetCaret(m_wpNew);
- m_pEdit->Backspace(false, true);
+ m_pEdit->Backspace(false);
return 0;
}
@@ -319,7 +319,7 @@
int CFXEU_Backspace::Redo() {
m_pEdit->SelectNone();
m_pEdit->SetCaret(m_wpOld);
- m_pEdit->Backspace(false, true);
+ m_pEdit->Backspace(false);
return 0;
}
@@ -327,9 +327,9 @@
m_pEdit->SelectNone();
m_pEdit->SetCaret(m_wpNew);
if (m_wpNew.nSecIndex != m_wpOld.nSecIndex)
- m_pEdit->InsertReturn(false, true);
+ m_pEdit->InsertReturn(false);
else
- m_pEdit->InsertWord(m_Word, m_nCharset, false, true);
+ m_pEdit->InsertWord(m_Word, m_nCharset, false);
return 0;
}
@@ -353,7 +353,7 @@
int CFXEU_Delete::Redo() {
m_pEdit->SelectNone();
m_pEdit->SetCaret(m_wpOld);
- m_pEdit->Delete(false, true);
+ m_pEdit->Delete(false);
return 0;
}
@@ -361,9 +361,9 @@
m_pEdit->SelectNone();
m_pEdit->SetCaret(m_wpNew);
if (m_bSecEnd)
- m_pEdit->InsertReturn(false, true);
+ m_pEdit->InsertReturn(false);
else
- m_pEdit->InsertWord(m_Word, m_nCharset, false, true);
+ m_pEdit->InsertWord(m_Word, m_nCharset, false);
return 0;
}
@@ -379,14 +379,14 @@
int CFXEU_Clear::Redo() {
m_pEdit->SelectNone();
m_pEdit->SetSelection(m_wrSel.BeginPos, m_wrSel.EndPos);
- m_pEdit->Clear(false, true);
+ m_pEdit->Clear(false);
return 0;
}
int CFXEU_Clear::Undo() {
m_pEdit->SelectNone();
m_pEdit->SetCaret(m_wrSel.BeginPos);
- m_pEdit->InsertText(m_swText, FX_CHARSET_Default, false, true);
+ m_pEdit->InsertText(m_swText, FX_CHARSET_Default, false);
m_pEdit->SetSelection(m_wrSel.BeginPos, m_wrSel.EndPos);
return 0;
}
@@ -409,14 +409,14 @@
int CFXEU_InsertText::Redo() {
m_pEdit->SelectNone();
m_pEdit->SetCaret(m_wpOld);
- m_pEdit->InsertText(m_swText, m_nCharset, false, true);
+ m_pEdit->InsertText(m_swText, m_nCharset, false);
return 0;
}
int CFXEU_InsertText::Undo() {
m_pEdit->SelectNone();
m_pEdit->SetSelection(m_wpOld, m_wpNew);
- m_pEdit->Clear(false, true);
+ m_pEdit->Clear(false);
return 0;
}
@@ -778,27 +778,27 @@
}
bool CPWL_EditImpl::InsertWord(uint16_t word, int32_t charset) {
- return InsertWord(word, charset, true, true);
+ return InsertWord(word, charset, true);
}
bool CPWL_EditImpl::InsertReturn() {
- return InsertReturn(true, true);
+ return InsertReturn(true);
}
bool CPWL_EditImpl::Backspace() {
- return Backspace(true, true);
+ return Backspace(true);
}
bool CPWL_EditImpl::Delete() {
- return Delete(true, true);
+ return Delete(true);
}
bool CPWL_EditImpl::ClearSelection() {
- return Clear(true, true);
+ return Clear(true);
}
bool CPWL_EditImpl::InsertText(const WideString& sText, int32_t charset) {
- return InsertText(sText, charset, true, true);
+ return InsertText(sText, charset, true);
}
float CPWL_EditImpl::GetFontSize() const {
@@ -1489,10 +1489,7 @@
}
}
-bool CPWL_EditImpl::InsertWord(uint16_t word,
- int32_t charset,
- bool bAddUndo,
- bool bPaint) {
+bool CPWL_EditImpl::InsertWord(uint16_t word, int32_t charset, bool bAddUndo) {
if (IsTextOverflow() || !m_pVT->IsValid())
return false;
@@ -1507,13 +1504,11 @@
AddEditUndoItem(std::make_unique<CFXEU_InsertWord>(
this, m_wpOldCaret, m_wpCaret, word, charset));
}
- if (bPaint)
- PaintInsertText(m_wpOldCaret, m_wpCaret);
-
+ PaintInsertText(m_wpOldCaret, m_wpCaret);
return true;
}
-bool CPWL_EditImpl::InsertReturn(bool bAddUndo, bool bPaint) {
+bool CPWL_EditImpl::InsertReturn(bool bAddUndo) {
if (IsTextOverflow() || !m_pVT->IsValid())
return false;
@@ -1527,17 +1522,15 @@
AddEditUndoItem(
std::make_unique<CFXEU_InsertReturn>(this, m_wpOldCaret, m_wpCaret));
}
- if (bPaint) {
- RearrangePart(CPVT_WordRange(m_wpOldCaret, m_wpCaret));
- ScrollToCaret();
- Refresh();
- SetCaretOrigin();
- SetCaretInfo();
- }
+ RearrangePart(CPVT_WordRange(m_wpOldCaret, m_wpCaret));
+ ScrollToCaret();
+ Refresh();
+ SetCaretOrigin();
+ SetCaretInfo();
return true;
}
-bool CPWL_EditImpl::Backspace(bool bAddUndo, bool bPaint) {
+bool CPWL_EditImpl::Backspace(bool bAddUndo) {
if (!m_pVT->IsValid() || m_wpCaret == m_pVT->GetBeginWordPlace())
return false;
@@ -1557,17 +1550,15 @@
AddEditUndoItem(std::make_unique<CFXEU_Backspace>(
this, m_wpOldCaret, m_wpCaret, word.Word, word.nCharset));
}
- if (bPaint) {
- RearrangePart(CPVT_WordRange(m_wpCaret, m_wpOldCaret));
- ScrollToCaret();
- Refresh();
- SetCaretOrigin();
- SetCaretInfo();
- }
+ RearrangePart(CPVT_WordRange(m_wpCaret, m_wpOldCaret));
+ ScrollToCaret();
+ Refresh();
+ SetCaretOrigin();
+ SetCaretInfo();
return true;
}
-bool CPWL_EditImpl::Delete(bool bAddUndo, bool bPaint) {
+bool CPWL_EditImpl::Delete(bool bAddUndo) {
if (!m_pVT->IsValid() || m_wpCaret == m_pVT->GetEndWordPlace())
return false;
@@ -1590,13 +1581,11 @@
this, m_wpOldCaret, m_wpCaret, word.Word, word.nCharset, bSecEnd));
}
}
- if (bPaint) {
- RearrangePart(CPVT_WordRange(m_wpOldCaret, m_wpCaret));
- ScrollToCaret();
- Refresh();
- SetCaretOrigin();
- SetCaretInfo();
- }
+ RearrangePart(CPVT_WordRange(m_wpOldCaret, m_wpCaret));
+ ScrollToCaret();
+ Refresh();
+ SetCaretOrigin();
+ SetCaretInfo();
return true;
}
@@ -1611,7 +1600,7 @@
return false;
}
-bool CPWL_EditImpl::Clear(bool bAddUndo, bool bPaint) {
+bool CPWL_EditImpl::Clear(bool bAddUndo) {
if (!m_pVT->IsValid() || m_SelState.IsEmpty())
return false;
@@ -1620,24 +1609,20 @@
AddEditUndoItem(
std::make_unique<CFXEU_Clear>(this, range, GetSelectedText()));
}
-
SelectNone();
SetCaret(m_pVT->DeleteWords(range));
m_SelState.Set(m_wpCaret, m_wpCaret);
- if (bPaint) {
- RearrangePart(range);
- ScrollToCaret();
- Refresh();
- SetCaretOrigin();
- SetCaretInfo();
- }
+ RearrangePart(range);
+ ScrollToCaret();
+ Refresh();
+ SetCaretOrigin();
+ SetCaretInfo();
return true;
}
bool CPWL_EditImpl::InsertText(const WideString& sText,
int32_t charset,
- bool bAddUndo,
- bool bPaint) {
+ bool bAddUndo) {
if (IsTextOverflow())
return false;
@@ -1651,9 +1636,7 @@
AddEditUndoItem(std::make_unique<CFXEU_InsertText>(
this, m_wpOldCaret, m_wpCaret, sText, charset));
}
- if (bPaint)
- PaintInsertText(m_wpOldCaret, m_wpCaret);
-
+ PaintInsertText(m_wpOldCaret, m_wpCaret);
return true;
}
diff --git a/fpdfsdk/pwl/cpwl_edit_impl.h b/fpdfsdk/pwl/cpwl_edit_impl.h
index e38e849..4098af1 100644
--- a/fpdfsdk/pwl/cpwl_edit_impl.h
+++ b/fpdfsdk/pwl/cpwl_edit_impl.h
@@ -356,15 +356,12 @@
void SetSelection(const CPVT_WordPlace& begin, const CPVT_WordPlace& end);
- bool Delete(bool bAddUndo, bool bPaint);
- bool Clear(bool bAddUndo, bool bPaint);
- bool InsertText(const WideString& sText,
- int32_t charset,
- bool bAddUndo,
- bool bPaint);
- bool InsertWord(uint16_t word, int32_t charset, bool bAddUndo, bool bPaint);
- bool InsertReturn(bool bAddUndo, bool bPaint);
- bool Backspace(bool bAddUndo, bool bPaint);
+ bool Delete(bool bAddUndo);
+ bool Clear(bool bAddUndo);
+ bool InsertText(const WideString& sText, int32_t charset, bool bAddUndo);
+ bool InsertWord(uint16_t word, int32_t charset, bool bAddUndo);
+ bool InsertReturn(bool bAddUndo);
+ bool Backspace(bool bAddUndo);
void SetCaret(const CPVT_WordPlace& place);
CFX_PointF VTToEdit(const CFX_PointF& point) const;
