XFA: Fix a bunch of pointless returns.

xfa/src/fee/src/fee/fde_txtedtengine.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 
 #include "xfa/src/foxitlib.h"
 #include "xfa/src/fee/include/ifde_txtedtengine.h"
@@ skipping 149 matching lines @@
 int32_t CFDE_TxtEdtEngine::GetTextLength() const {
   return GetTextBufLength();
 }
 void CFDE_TxtEdtEngine::GetText(CFX_WideString& wsText,
                                 int32_t nStart,
                                 int32_t nCount) {
   int32_t nTextBufLength = GetTextBufLength();
   if (nCount == -1) {
     nCount = nTextBufLength - nStart;
   }
 #ifdef FDE_USEFORMATBLOCK

[Tom Sepez, 2016/01/26 00:15:38]

Did we ever get an answer about FDE_USEFORMATBLOCK?

[Lei Zhang, 2016/01/26 00:31:02]

I forgot to ask. I'll do that now.

   int32_t nBlockCount = m_BlockArray.GetSize();
   if (nBlockCount == 0 || m_wsFixText.IsEmpty()) {
     m_pTxtBuf->GetRange(wsText, nStart, nCount);
     return;
   }
   CFX_WideString wsTemp;
   const FX_WCHAR* lpFixBuffer = const FX_WCHAR * (m_wsFixText);
   FX_WCHAR* lpBuffer = wsTemp.GetBuffer(nTextBufLength);
   int32_t nRealLength = 0;
   int32_t nPrePos = 0;
@@ skipping 22 matching lines @@
   int32_t nRealBgn = GetRealIndex(nStart);
   int32_t nRealEnd = GetRealIndex(nStart + nCount - 1);
   int32_t nRealCount = nRealEnd - nRealBgn;
   FX_WCHAR* lpDestBuf = wsText.GetBuffer(nRealCount);
   FXSYS_memcpy(lpDestBuf, const FX_WCHAR*(wsTemp) + nRealBgn,
                nRealCount * sizeof(FX_WCHAR));
   wsText.ReleaseBuffer();
 #else
   m_pTxtBuf->GetRange(wsText, nStart, nCount);
   RecoverParagEnd(wsText);
-  return;
 #endif
 }
+
 void CFDE_TxtEdtEngine::ClearText() {
   DeleteRange(0, -1);
 }
 int32_t CFDE_TxtEdtEngine::GetCaretRect(CFX_RectF& rtCaret) const {
   rtCaret = m_rtCaret;
   return m_nCaret;
 }
 int32_t CFDE_TxtEdtEngine::GetCaretPos() const {
   if (IsLocked()) {
     return 0;
@@ skipping 701 matching lines @@
   int32_t nRangeCount = m_SelRangePtrArr.GetSize();
   int32_t i = 0;
   for (i = 0; i < nRangeCount; i++) {
     lpTemp = m_SelRangePtrArr[i];
     if (lpTemp->nStart == nStart && lpTemp->nCount == nCount) {
       delete lpTemp;
       m_SelRangePtrArr.RemoveAt(i);
       return;
     }
   }
-  return;
 }
+
 void CFDE_TxtEdtEngine::AddSelRange(int32_t nStart, int32_t nCount) {
   if (nCount == -1) {
     nCount = GetTextLength() - nStart;
   }
   int32_t nSize = m_SelRangePtrArr.GetSize();
   if (nSize <= 0) {
     FDE_LPTXTEDTSELRANGE lpSelRange = new FDE_TXTEDTSELRANGE;
     lpSelRange->nStart = nStart;
     lpSelRange->nCount = nCount;
     m_SelRangePtrArr.Add(lpSelRange);
@@ skipping 47 matching lines @@
     lpTemp->nStart = nStart;
     lpTemp->nCount = nCount;
     nRangeCnt--;
     nRangeBgn++;
     while (nRangeCnt--) {
       delete m_SelRangePtrArr[nRangeBgn];
       m_SelRangePtrArr.RemoveAt(nRangeBgn);
     }
   }
   m_Param.pEventSink->On_SelChanged(this);
-  return;
 }
+
 int32_t CFDE_TxtEdtEngine::CountSelRanges() {
   return m_SelRangePtrArr.GetSize();
 }
 int32_t CFDE_TxtEdtEngine::GetSelRange(int32_t nIndex, int32_t& nStart) {
   nStart = m_SelRangePtrArr[nIndex]->nStart;
   return m_SelRangePtrArr[nIndex]->nCount;
 }
 void CFDE_TxtEdtEngine::ClearSelection() {
   int32_t nCount = m_SelRangePtrArr.GetSize();
   FDE_LPTXTEDTSELRANGE lpRange = NULL;
@@ skipping 1839 matching lines @@
   ArchiveLoader >> nField;
   m_pField = (CFDE_TxtEdtField*)nField;
   ArchiveLoader >> m_nIndexInField;
   ArchiveLoader >> m_nFieldBgn;
   ArchiveLoader >> m_nFieldNewLength;
   ArchiveLoader >> m_wsDel;
   ArchiveLoader >> m_wsIns;
   ArchiveLoader >> m_bSel;
 }
 #endif