XFA: Fix a bunch of pointless returns.chromium/2637chromium/2636chromium/2635chromium/2634chromium/2633chromium/2632

And a few other nits.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1635853002 .

2 files changed, 5 insertions, 5 deletions

diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/src/fee/fde_txtedtengine.cpp
index 7d87f2c0e9..72965bd20c 100644
--- a/xfa/src/fee/src/fee/fde_txtedtengine.cpp
+++ b/xfa/src/fee/src/fee/fde_txtedtengine.cpp
@@ -210,9 +210,9 @@ void CFDE_TxtEdtEngine::GetText(CFX_WideString& wsText,
 #else

   m_pTxtBuf->GetRange(wsText, nStart, nCount);

   RecoverParagEnd(wsText);

-  return;

 #endif

 }

+

 void CFDE_TxtEdtEngine::ClearText() {

   DeleteRange(0, -1);

 }

@@ -934,8 +934,8 @@ void CFDE_TxtEdtEngine::RemoveSelRange(int32_t nStart, int32_t nCount) {
       return;

     }

   }

-  return;

 }

+

 void CFDE_TxtEdtEngine::AddSelRange(int32_t nStart, int32_t nCount) {

   if (nCount == -1) {

     nCount = GetTextLength() - nStart;

@@ -1003,8 +1003,8 @@ void CFDE_TxtEdtEngine::AddSelRange(int32_t nStart, int32_t nCount) {
     }

   }

   m_Param.pEventSink->On_SelChanged(this);

-  return;

 }

+

 int32_t CFDE_TxtEdtEngine::CountSelRanges() {

   return m_SelRangePtrArr.GetSize();

 }

diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.cpp b/xfa/src/fee/src/fee/fde_txtedtpage.cpp
index fbeccbeba0..e561a1f9cf 100644
--- a/xfa/src/fee/src/fee/fde_txtedtpage.cpp
+++ b/xfa/src/fee/src/fee/fde_txtedtpage.cpp
@@ -351,8 +351,8 @@ void CFDE_TxtEdtPage::CalcRangeRectArray(int32_t nStart,
       RectFArr.Add(piece->rtPiece);

     }

   }

-  return;

 }

+

 int32_t CFDE_TxtEdtPage::SelectWord(const CFX_PointF& fPoint, int32_t& nCount) {

   if (m_nRefCount < 0) {

     return -1;

@@ -582,8 +582,8 @@ void CFDE_TxtEdtPage::UnloadPage(FX_LPCRECTF pClipBox) {
     m_pBgnParag = NULL;

     m_pEndParag = NULL;

   }

-  return;

 }

+

 const CFX_RectF& CFDE_TxtEdtPage::GetContentsBox() {

   return m_rtPageContents;

 }