Convert several CPWL_EditImpl methods to return void.
We never do anything differently based on return value.
Change-Id: Ifc85a6dc9e9e6f4ff1d8c84893b8adb838ba7eb0
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/129610
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Thomas Sepez <tsepez@google.com>
diff --git a/fpdfsdk/pwl/cpwl_edit_impl.cpp b/fpdfsdk/pwl/cpwl_edit_impl.cpp
index d29d2e8..a96b937 100644
--- a/fpdfsdk/pwl/cpwl_edit_impl.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_impl.cpp
@@ -905,12 +905,12 @@
return InsertWord(word, charset, true);
}
-bool CPWL_EditImpl::InsertReturn() {
- return InsertReturn(true);
+void CPWL_EditImpl::InsertReturn() {
+ InsertReturn(true);
}
-bool CPWL_EditImpl::Backspace() {
- return Backspace(true);
+void CPWL_EditImpl::Backspace() {
+ Backspace(true);
}
bool CPWL_EditImpl::Delete() {
@@ -921,8 +921,8 @@
return Clear(true);
}
-bool CPWL_EditImpl::InsertText(const WideString& sText, FX_Charset charset) {
- return InsertText(sText, charset, true);
+void CPWL_EditImpl::InsertText(const WideString& sText, FX_Charset charset) {
+ InsertText(sText, charset, true);
}
float CPWL_EditImpl::GetFontSize() const {
@@ -1637,15 +1637,15 @@
return true;
}
-bool CPWL_EditImpl::InsertReturn(bool bAddUndo) {
+void CPWL_EditImpl::InsertReturn(bool bAddUndo) {
if (IsTextOverflow() || !m_pVT->IsValid())
- return false;
+ return;
m_pVT->UpdateWordPlace(m_wpCaret);
SetCaret(m_pVT->InsertSection(m_wpCaret));
m_SelState.Set(m_wpCaret, m_wpCaret);
if (m_wpCaret == m_wpOldCaret)
- return false;
+ return;
if (bAddUndo && m_bEnableUndo) {
AddEditUndoItem(
@@ -1656,12 +1656,11 @@
Refresh();
SetCaretOrigin();
SetCaretInfo();
- return true;
}
-bool CPWL_EditImpl::Backspace(bool bAddUndo) {
+void CPWL_EditImpl::Backspace(bool bAddUndo) {
if (!m_pVT->IsValid() || m_wpCaret == m_pVT->GetBeginWordPlace())
- return false;
+ return;
CPVT_Word word;
if (bAddUndo) {
@@ -1673,7 +1672,7 @@
SetCaret(m_pVT->BackSpaceWord(m_wpCaret));
m_SelState.Set(m_wpCaret, m_wpCaret);
if (m_wpCaret == m_wpOldCaret)
- return false;
+ return;
if (bAddUndo && m_bEnableUndo) {
AddEditUndoItem(std::make_unique<UndoBackspace>(
@@ -1684,7 +1683,6 @@
Refresh();
SetCaretOrigin();
SetCaretInfo();
- return true;
}
bool CPWL_EditImpl::Delete(bool bAddUndo) {
@@ -1749,24 +1747,23 @@
return true;
}
-bool CPWL_EditImpl::InsertText(const WideString& sText,
+void CPWL_EditImpl::InsertText(const WideString& sText,
FX_Charset charset,
bool bAddUndo) {
if (IsTextOverflow())
- return false;
+ return;
m_pVT->UpdateWordPlace(m_wpCaret);
SetCaret(DoInsertText(m_wpCaret, sText, charset));
m_SelState.Set(m_wpCaret, m_wpCaret);
if (m_wpCaret == m_wpOldCaret)
- return false;
+ return;
if (bAddUndo && m_bEnableUndo) {
AddEditUndoItem(std::make_unique<UndoInsertText>(
this, m_wpOldCaret, m_wpCaret, sText, charset));
}
PaintInsertText(m_wpOldCaret, m_wpCaret);
- return true;
}
void CPWL_EditImpl::PaintInsertText(const CPVT_WordPlace& wpOld,
diff --git a/fpdfsdk/pwl/cpwl_edit_impl.h b/fpdfsdk/pwl/cpwl_edit_impl.h
index 245bc6c..287c34f 100644
--- a/fpdfsdk/pwl/cpwl_edit_impl.h
+++ b/fpdfsdk/pwl/cpwl_edit_impl.h
@@ -94,11 +94,11 @@
void OnVK_END(bool bShift, bool bCtrl);
void SetText(const WideString& sText);
bool InsertWord(uint16_t word, FX_Charset charset);
- bool InsertReturn();
- bool Backspace();
+ void InsertReturn();
+ void Backspace();
bool Delete();
bool ClearSelection();
- bool InsertText(const WideString& sText, FX_Charset charset);
+ void InsertText(const WideString& sText, FX_Charset charset);
void ReplaceAndKeepSelection(const WideString& text);
void ReplaceSelection(const WideString& text);
bool Redo();
@@ -247,10 +247,10 @@
void SetSelection(const CPVT_WordPlace& begin, const CPVT_WordPlace& end);
bool Delete(bool bAddUndo);
bool Clear(bool bAddUndo);
- bool InsertText(const WideString& sText, FX_Charset charset, bool bAddUndo);
+ void InsertText(const WideString& sText, FX_Charset charset, bool bAddUndo);
bool InsertWord(uint16_t word, FX_Charset charset, bool bAddUndo);
- bool InsertReturn(bool bAddUndo);
- bool Backspace(bool bAddUndo);
+ void InsertReturn(bool bAddUndo);
+ void Backspace(bool bAddUndo);
void SetCaret(const CPVT_WordPlace& place);
CFX_PointF VTToEdit(const CFX_PointF& point) const;