Merge to XFA: Remove header files that only have includes.

fpdfsdk/src/fxedit/fxet_edit.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 "fpdfsdk/include/fxedit/fxet_edit.h"
-#include "fpdfsdk/include/fxedit/fxet_stub.h"
+
+#include "core/include/fpdfapi/fpdf_resource.h"
 
 #define FX_EDIT_UNDO_MAXITEM 10000
 
-/* ---------------------------- CFX_Edit_Iterator ----------------------------
- */
-
 CFX_Edit_Iterator::CFX_Edit_Iterator(CFX_Edit* pEdit,
                                      IPDF_VariableText_Iterator* pVTIterator)
     : m_pEdit(pEdit), m_pVTIterator(pVTIterator) {}
 
 CFX_Edit_Iterator::~CFX_Edit_Iterator() {}
 
 FX_BOOL CFX_Edit_Iterator::NextWord() {
   return m_pVTIterator->NextWord();
 }
 
@@ skipping 56 matching lines @@
 }
 
 const CPVT_WordPlace& CFX_Edit_Iterator::GetAt() const {
   return m_pVTIterator->GetAt();
 }
 
 IFX_Edit* CFX_Edit_Iterator::GetEdit() const {
   return m_pEdit;
 }
 
-/* --------------------------- CFX_Edit_Provider -------------------------------
- */
-
 CFX_Edit_Provider::CFX_Edit_Provider(IFX_Edit_FontMap* pFontMap)
     : m_pFontMap(pFontMap) {
   ASSERT(m_pFontMap);
 }
 
 CFX_Edit_Provider::~CFX_Edit_Provider() {}
 
 IFX_Edit_FontMap* CFX_Edit_Provider::GetFontMap() {
   return m_pFontMap;
 }
@@ skipping 37 matching lines @@
 }
 
 int32_t CFX_Edit_Provider::GetDefaultFontIndex() {
   return 0;
 }
 
 FX_BOOL CFX_Edit_Provider::IsLatinWord(FX_WORD word) {
   return FX_EDIT_ISLATINWORD(word);
 }
 
-/* --------------------------------- CFX_Edit_Refresh
- * --------------------------------- */
-
 CFX_Edit_Refresh::CFX_Edit_Refresh() {}
 
 CFX_Edit_Refresh::~CFX_Edit_Refresh() {}
 
 void CFX_Edit_Refresh::BeginRefresh() {
   m_RefreshRects.Empty();
   m_OldLineRects = m_NewLineRects;
 }
 
 void CFX_Edit_Refresh::Push(const CPVT_WordRange& linerange,
@@ skipping 48 matching lines @@
                 rcResult.Union(pNewRect->m_rcLine);
                 m_RefreshRects.Add(rcResult);
               } else {
                 if (!pNewRect->IsSameLeft(*pOldRect)) {
                   rcResult = pOldRect->m_rcLine;
                   rcResult.Union(pNewRect->m_rcLine);
                 } else {
                   fWidthDiff =
                       pNewRect->m_rcLine.Width() - pOldRect->m_rcLine.Width();
                   rcResult = pNewRect->m_rcLine;
-                  if (fWidthDiff > 0.0f)
+                  if (fWidthDiff > 0.0f) {
                     rcResult.left = rcResult.right - fWidthDiff;
-                  else {
+                  } else {
                     rcResult.left = rcResult.right;
                     rcResult.right += (-fWidthDiff);
                   }
                 }
                 m_RefreshRects.Add(rcResult);
               }
             } else {
               rcResult = pOldRect->m_rcLine;
               rcResult.Union(pNewRect->m_rcLine);
               m_RefreshRects.Add(rcResult);
             }
-          } else {
-            // don't need to do anything
           }
         }
       } else {
         m_RefreshRects.Add(pOldRect->m_rcLine);
       }
     } else {
       if (pNewRect) {
         m_RefreshRects.Add(pNewRect->m_rcLine);
-      } else {
-        // error
       }
     }
     i++;
   }
 }
 
 void CFX_Edit_Refresh::AddRefresh(const CPDF_Rect& rect) {
   m_RefreshRects.Add(rect);
 }
 
 const CFX_Edit_RectArray* CFX_Edit_Refresh::GetRefreshRects() const {
   return &m_RefreshRects;
 }
 
 void CFX_Edit_Refresh::EndRefresh() {
   m_RefreshRects.Empty();
 }
 
-/* ------------------------------------- CFX_Edit_Undo
- * ------------------------------------- */
-
 CFX_Edit_Undo::CFX_Edit_Undo(int32_t nBufsize)
     : m_nCurUndoPos(0),
       m_nBufSize(nBufsize),
       m_bModified(FALSE),
       m_bVirgin(TRUE),
       m_bWorking(FALSE) {}
 
 CFX_Edit_Undo::~CFX_Edit_Undo() {
   Reset();
 }
@@ skipping 85 matching lines @@
 }
 
 void CFX_Edit_Undo::Reset() {
   for (int32_t i = 0, sz = m_UndoItemStack.GetSize(); i < sz; i++) {
     delete m_UndoItemStack.GetAt(i);
   }
   m_nCurUndoPos = 0;
   m_UndoItemStack.RemoveAll();
 }
 
-/* -------------------------------- CFX_Edit_GroupUndoItem
- * -------------------------------- */
-
 CFX_Edit_GroupUndoItem::CFX_Edit_GroupUndoItem(const CFX_WideString& sTitle)
     : m_sTitle(sTitle) {}
 
 CFX_Edit_GroupUndoItem::~CFX_Edit_GroupUndoItem() {
   for (int i = 0, sz = m_Items.GetSize(); i < sz; i++) {
     delete m_Items[i];
   }
 
   m_Items.RemoveAll();
 }
@@ skipping 29 matching lines @@
   for (int i = 0, sz = m_Items.GetSize(); i < sz; i++) {
     CFX_Edit_UndoItem* pUndoItem = m_Items[i];
     pUndoItem->Redo();
   }
 }
 
 CFX_WideString CFX_Edit_GroupUndoItem::GetUndoTitle() {
   return m_sTitle;
 }
 
-/* ------------------------------------- CFX_Edit_UndoItem derived classes
- * ------------------------------------- */
-
 CFXEU_InsertWord::CFXEU_InsertWord(CFX_Edit* pEdit,
                                    const CPVT_WordPlace& wpOldPlace,
                                    const CPVT_WordPlace& wpNewPlace,
                                    FX_WORD word,
                                    int32_t charset,
                                    const CPVT_WordProps* pWordProps)
     : m_pEdit(pEdit),
       m_wpOld(wpOldPlace),
       m_wpNew(wpNewPlace),
       m_Word(word),
@@ skipping 14 matching lines @@
 }
 
 void CFXEU_InsertWord::Undo() {
   if (m_pEdit) {
     m_pEdit->SelectNone();
     m_pEdit->SetCaret(m_wpNew);
     m_pEdit->Backspace(FALSE, TRUE);
   }
 }
 
-/* -------------------------------------------------------------------------- */
-
 CFXEU_InsertReturn::CFXEU_InsertReturn(CFX_Edit* pEdit,
                                        const CPVT_WordPlace& wpOldPlace,
                                        const CPVT_WordPlace& wpNewPlace,
                                        const CPVT_SecProps* pSecProps,
                                        const CPVT_WordProps* pWordProps)
     : m_pEdit(pEdit),
       m_wpOld(wpOldPlace),
       m_wpNew(wpNewPlace),
       m_SecProps(),
       m_WordProps() {
@@ skipping 14 matching lines @@
 }
 
 void CFXEU_InsertReturn::Undo() {
   if (m_pEdit) {
     m_pEdit->SelectNone();
     m_pEdit->SetCaret(m_wpNew);
     m_pEdit->Backspace(FALSE, TRUE);
   }
 }
 
-/* -------------------------------------------------------------------------- */
-// CFXEU_Backspace
-
 CFXEU_Backspace::CFXEU_Backspace(CFX_Edit* pEdit,
                                  const CPVT_WordPlace& wpOldPlace,
                                  const CPVT_WordPlace& wpNewPlace,
                                  FX_WORD word,
                                  int32_t charset,
                                  const CPVT_SecProps& SecProps,
                                  const CPVT_WordProps& WordProps)
     : m_pEdit(pEdit),
       m_wpOld(wpOldPlace),
       m_wpNew(wpNewPlace),
@@ skipping 17 matching lines @@
     m_pEdit->SelectNone();
     m_pEdit->SetCaret(m_wpNew);
     if (m_wpNew.SecCmp(m_wpOld) != 0) {
       m_pEdit->InsertReturn(&m_SecProps, &m_WordProps, FALSE, TRUE);
     } else {
       m_pEdit->InsertWord(m_Word, m_nCharset, &m_WordProps, FALSE, TRUE);
     }
   }
 }
 
-/* -------------------------------------------------------------------------- */
-// CFXEU_Delete
-
 CFXEU_Delete::CFXEU_Delete(CFX_Edit* pEdit,
                            const CPVT_WordPlace& wpOldPlace,
                            const CPVT_WordPlace& wpNewPlace,
                            FX_WORD word,
                            int32_t charset,
                            const CPVT_SecProps& SecProps,
                            const CPVT_WordProps& WordProps,
                            FX_BOOL bSecEnd)
     : m_pEdit(pEdit),
       m_wpOld(wpOldPlace),
@@ skipping 19 matching lines @@
     m_pEdit->SelectNone();
     m_pEdit->SetCaret(m_wpNew);
     if (m_bSecEnd) {
       m_pEdit->InsertReturn(&m_SecProps, &m_WordProps, FALSE, TRUE);
     } else {
       m_pEdit->InsertWord(m_Word, m_nCharset, &m_WordProps, FALSE, TRUE);
     }
   }
 }
 
-/* -------------------------------------------------------------------------- */
-// CFXEU_Clear
-
 CFXEU_Clear::CFXEU_Clear(CFX_Edit* pEdit,
                          const CPVT_WordRange& wrSel,
                          const CFX_WideString& swText)
     : m_pEdit(pEdit), m_wrSel(wrSel), m_swText(swText) {}
 
 CFXEU_Clear::~CFXEU_Clear() {}
 
 void CFXEU_Clear::Redo() {
   if (m_pEdit) {
     m_pEdit->SelectNone();
     m_pEdit->SetSel(m_wrSel.BeginPos, m_wrSel.EndPos);
     m_pEdit->Clear(FALSE, TRUE);
   }
 }
 
 void CFXEU_Clear::Undo() {
   if (m_pEdit) {
     m_pEdit->SelectNone();
     m_pEdit->SetCaret(m_wrSel.BeginPos);
     m_pEdit->InsertText(m_swText.c_str(), DEFAULT_CHARSET, NULL, NULL, FALSE,
                         TRUE);
     m_pEdit->SetSel(m_wrSel.BeginPos, m_wrSel.EndPos);
   }
 }
 
-/* -------------------------------------------------------------------------- */
-// CFXEU_ClearRich
-
 CFXEU_ClearRich::CFXEU_ClearRich(CFX_Edit* pEdit,
                                  const CPVT_WordPlace& wpOldPlace,
                                  const CPVT_WordPlace& wpNewPlace,
                                  const CPVT_WordRange& wrSel,
                                  FX_WORD word,
                                  int32_t charset,
                                  const CPVT_SecProps& SecProps,
                                  const CPVT_WordProps& WordProps)
     : m_pEdit(pEdit),
       m_wpOld(wpOldPlace),
@@ skipping 23 matching lines @@
     } else {
       m_pEdit->InsertWord(m_Word, m_nCharset, &m_WordProps, FALSE, FALSE);
     }
 
     if (IsFirst()) {
       m_pEdit->PaintInsertText(m_wrSel.BeginPos, m_wrSel.EndPos);
       m_pEdit->SetSel(m_wrSel.BeginPos, m_wrSel.EndPos);
     }
   }
 }
-/* -------------------------------------------------------------------------- */
-// CFXEU_InsertText
-
 CFXEU_InsertText::CFXEU_InsertText(CFX_Edit* pEdit,
                                    const CPVT_WordPlace& wpOldPlace,
                                    const CPVT_WordPlace& wpNewPlace,
                                    const CFX_WideString& swText,
                                    int32_t charset,
                                    const CPVT_SecProps* pSecProps,
                                    const CPVT_WordProps* pWordProps)
     : m_pEdit(pEdit),
       m_wpOld(wpOldPlace),
       m_wpNew(wpNewPlace),
@@ skipping 19 matching lines @@
 }
 
 void CFXEU_InsertText::Undo() {
   if (m_pEdit) {
     m_pEdit->SelectNone();
     m_pEdit->SetSel(m_wpOld, m_wpNew);
     m_pEdit->Clear(FALSE, TRUE);
   }
 }
 
-/* -------------------------------------------------------------------------- */
-
 CFXEU_SetSecProps::CFXEU_SetSecProps(CFX_Edit* pEdit,
                                      const CPVT_WordPlace& place,
                                      EDIT_PROPS_E ep,
                                      const CPVT_SecProps& oldsecprops,
                                      const CPVT_WordProps& oldwordprops,
                                      const CPVT_SecProps& newsecprops,
                                      const CPVT_WordProps& newwordprops,
                                      const CPVT_WordRange& range)
     : m_pEdit(pEdit),
       m_wpPlace(place),
@@ skipping 23 matching lines @@
     m_pEdit->SetSecProps(m_eProps, m_wpPlace, &m_OldSecProps, &m_OldWordProps,
                          m_wrPlace, FALSE);
     if (IsFirst()) {
       m_pEdit->SelectNone();
       m_pEdit->PaintSetProps(m_eProps, m_wrPlace);
       m_pEdit->SetSel(m_wrPlace.BeginPos, m_wrPlace.EndPos);
     }
   }
 }
 
-/* -------------------------------------------------------------------------- */
-
 CFXEU_SetWordProps::CFXEU_SetWordProps(CFX_Edit* pEdit,
                                        const CPVT_WordPlace& place,
                                        EDIT_PROPS_E ep,
                                        const CPVT_WordProps& oldprops,
                                        const CPVT_WordProps& newprops,
                                        const CPVT_WordRange& range)
     : m_pEdit(pEdit),
       m_wpPlace(place),
       m_wrPlace(range),
       m_eProps(ep),
@@ skipping 19 matching lines @@
     m_pEdit->SetWordProps(m_eProps, m_wpPlace, &m_OldWordProps, m_wrPlace,
                           FALSE);
     if (IsFirst()) {
       m_pEdit->SelectNone();
       m_pEdit->PaintSetProps(m_eProps, m_wrPlace);
       m_pEdit->SetSel(m_wrPlace.BeginPos, m_wrPlace.EndPos);
     }
   }
 }
 
-/* ------------------------------------- CFX_Edit
- * ------------------------------------- */
-
 CFX_Edit::CFX_Edit(IPDF_VariableText* pVT)
     : m_pVT(pVT),
       m_pNotify(NULL),
       m_pOprNotify(NULL),
       m_pVTProvide(NULL),
       m_wpCaret(-1, -1, -1),
       m_wpOldCaret(-1, -1, -1),
       m_SelState(),
       m_ptScrollPos(0, 0),
       m_ptRefreshScrollPos(0, 0),
@@ skipping 14 matching lines @@
 }
 
 CFX_Edit::~CFX_Edit() {
   delete m_pVTProvide;
   m_pVTProvide = NULL;
   delete m_pIterator;
   m_pIterator = NULL;
   ASSERT(!m_pGroupUndoItem);
 }
 
-// public methods
-
 void CFX_Edit::Initialize() {
   m_pVT->Initialize();
   SetCaret(m_pVT->GetBeginWordPlace());
   SetCaretOrigin();
 }
 
 void CFX_Edit::SetFontMap(IFX_Edit_FontMap* pFontMap) {
   delete m_pVTProvide;
   m_pVT->SetProvider(m_pVTProvide = new CFX_Edit_Provider(pFontMap));
 }
@@ skipping 21 matching lines @@
   return m_pVT;
 }
 
 IFX_Edit_FontMap* CFX_Edit::GetFontMap() {
   if (m_pVTProvide)
     return m_pVTProvide->GetFontMap();
 
   return NULL;
 }
 
-void CFX_Edit::SetPlateRect(const CPDF_Rect& rect, FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetPlateRect(const CPDF_Rect& rect, FX_BOOL bPaint) {
   m_pVT->SetPlateRect(rect);
   m_ptScrollPos = CPDF_Point(rect.left, rect.top);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetAlignmentH(int32_t nFormat /* =0 */,
-                             FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetAlignmentH(int32_t nFormat, FX_BOOL bPaint) {
   m_pVT->SetAlignment(nFormat);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetAlignmentV(int32_t nFormat /* =0 */,
-                             FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetAlignmentV(int32_t nFormat, FX_BOOL bPaint) {
   m_nAlignment = nFormat;
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetPasswordChar(FX_WORD wSubWord /* ='*' */,
-                               FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetPasswordChar(FX_WORD wSubWord, FX_BOOL bPaint) {
   m_pVT->SetPasswordChar(wSubWord);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetLimitChar(int32_t nLimitChar /* =0 */,
-                            FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetLimitChar(int32_t nLimitChar, FX_BOOL bPaint) {
   m_pVT->SetLimitChar(nLimitChar);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetCharArray(int32_t nCharArray /* =0 */,
-                            FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetCharArray(int32_t nCharArray, FX_BOOL bPaint) {
   m_pVT->SetCharArray(nCharArray);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetCharSpace(FX_FLOAT fCharSpace /* =0.0f */,
-                            FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetCharSpace(FX_FLOAT fCharSpace, FX_BOOL bPaint) {
   m_pVT->SetCharSpace(fCharSpace);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetHorzScale(int32_t nHorzScale /* =100 */,
-                            FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetHorzScale(int32_t nHorzScale, FX_BOOL bPaint) {
   m_pVT->SetHorzScale(nHorzScale);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetMultiLine(FX_BOOL bMultiLine /* =TRUE */,
-                            FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetMultiLine(FX_BOOL bMultiLine, FX_BOOL bPaint) {
   m_pVT->SetMultiLine(bMultiLine);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetAutoReturn(FX_BOOL bAuto /* =TRUE */,
-                             FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetAutoReturn(FX_BOOL bAuto, FX_BOOL bPaint) {
   m_pVT->SetAutoReturn(bAuto);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetLineLeading(FX_FLOAT fLineLeading /* =TRUE */,
-                              FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetLineLeading(FX_FLOAT fLineLeading, FX_BOOL bPaint) {
   m_pVT->SetLineLeading(fLineLeading);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetAutoFontSize(FX_BOOL bAuto /* =TRUE */,
-                               FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetAutoFontSize(FX_BOOL bAuto, FX_BOOL bPaint) {
   m_pVT->SetAutoFontSize(bAuto);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetFontSize(FX_FLOAT fFontSize, FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetFontSize(FX_FLOAT fFontSize, FX_BOOL bPaint) {
   m_pVT->SetFontSize(fFontSize);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetAutoScroll(FX_BOOL bAuto /* =TRUE */,
-                             FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetAutoScroll(FX_BOOL bAuto, FX_BOOL bPaint) {
   m_bEnableScroll = bAuto;
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetTextOverflow(FX_BOOL bAllowed /*= FALSE*/,
-                               FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetTextOverflow(FX_BOOL bAllowed, FX_BOOL bPaint) {
   m_bEnableOverflow = bAllowed;
   if (bPaint)
     Paint();
 }
 
 void CFX_Edit::SetSel(int32_t nStartChar, int32_t nEndChar) {
   if (m_pVT->IsValid()) {
     if (nStartChar == 0 && nEndChar < 0) {
       SelectAll();
     } else if (nStartChar < 0) {
@@ skipping 176 matching lines @@
     wrRet.EndPos = wr1.EndPos;
   }
 
   return wrRet;
 }
 
 FX_BOOL CFX_Edit::IsRichText() const {
   return m_pVT->IsRichText();
 }
 
-void CFX_Edit::SetRichText(FX_BOOL bRichText /* =TRUE */,
-                           FX_BOOL bPaint /* = TRUE*/) {
+void CFX_Edit::SetRichText(FX_BOOL bRichText, FX_BOOL bPaint) {
   m_pVT->SetRichText(bRichText);
   if (bPaint)
     Paint();
 }
 
 FX_BOOL CFX_Edit::SetRichFontIndex(int32_t nFontIndex) {
   CPVT_WordProps WordProps;
   WordProps.nFontIndex = nFontIndex;
   return SetRichTextProps(EP_FONTINDEX, NULL, &WordProps);
 }
@@ skipping 43 matching lines @@
     WordProps.nWordStyle |= PVTWORD_STYLE_CROSSOUT;
   return SetRichTextProps(EP_CROSSOUT, NULL, &WordProps);
 }
 
 FX_BOOL CFX_Edit::SetRichTextCharSpace(FX_FLOAT fCharSpace) {
   CPVT_WordProps WordProps;
   WordProps.fCharSpace = fCharSpace;
   return SetRichTextProps(EP_CHARSPACE, NULL, &WordProps);
 }
 
-FX_BOOL CFX_Edit::SetRichTextHorzScale(int32_t nHorzScale /*= 100*/) {
+FX_BOOL CFX_Edit::SetRichTextHorzScale(int32_t nHorzScale) {
   CPVT_WordProps WordProps;
   WordProps.nHorzScale = nHorzScale;
   return SetRichTextProps(EP_HORZSCALE, NULL, &WordProps);
 }
 
 FX_BOOL CFX_Edit::SetRichTextLineLeading(FX_FLOAT fLineLeading) {
   CPVT_SecProps SecProps;
   SecProps.fLineLeading = fLineLeading;
   return SetRichTextProps(EP_LINELEADING, &SecProps, NULL);
 }
@@ skipping 17 matching lines @@
   FX_BOOL bSet1, bSet2;
   if (m_pVT->IsValid() && m_pVT->IsRichText()) {
     if (IPDF_VariableText_Iterator* pIterator = m_pVT->GetIterator()) {
       CPVT_WordRange wrTemp = m_SelState.ConvertToWordRange();
 
       m_pVT->UpdateWordPlace(wrTemp.BeginPos);
       m_pVT->UpdateWordPlace(wrTemp.EndPos);
       pIterator->SetAt(wrTemp.BeginPos);
 
       BeginGroupUndo(L"");
-      ;
-
       bSet = SetSecProps(eProps, wrTemp.BeginPos, pSecProps, pWordProps, wrTemp,
                          TRUE);
 
       while (pIterator->NextWord()) {
         CPVT_WordPlace place = pIterator->GetAt();
         if (place.WordCmp(wrTemp.EndPos) > 0)
           break;
         bSet1 = SetSecProps(eProps, place, pSecProps, pWordProps, wrTemp, TRUE);
         bSet2 = SetWordProps(eProps, place, pWordProps, wrTemp, TRUE);
 
@@ skipping 365 matching lines @@
 
       pIterator->SetAt(oldplace);
       return bSet;
     }
   }
 
   return FALSE;
 }
 
 void CFX_Edit::SetText(const FX_WCHAR* text,
-                       int32_t charset /*= DEFAULT_CHARSET*/,
-                       const CPVT_SecProps* pSecProps /*= NULL*/,
-                       const CPVT_WordProps* pWordProps /*= NULL*/) {
+                       int32_t charset,
+                       const CPVT_SecProps* pSecProps,
+                       const CPVT_WordProps* pWordProps) {
   SetText(text, charset, pSecProps, pWordProps, TRUE, TRUE);
 }
 
 FX_BOOL CFX_Edit::InsertWord(FX_WORD word,
-                             int32_t charset /*= DEFAULT_CHARSET*/,
-                             const CPVT_WordProps* pWordProps /*= NULL*/) {
+                             int32_t charset,
+                             const CPVT_WordProps* pWordProps) {
   return InsertWord(word, charset, pWordProps, TRUE, TRUE);
 }
 
-FX_BOOL CFX_Edit::InsertReturn(const CPVT_SecProps* pSecProps /*= NULL*/,
-                               const CPVT_WordProps* pWordProps /*= NULL*/) {
+FX_BOOL CFX_Edit::InsertReturn(const CPVT_SecProps* pSecProps,
+                               const CPVT_WordProps* pWordProps) {
   return InsertReturn(pSecProps, pWordProps, TRUE, TRUE);
 }
 
 FX_BOOL CFX_Edit::Backspace() {
   return Backspace(TRUE, TRUE);
 }
 
 FX_BOOL CFX_Edit::Delete() {
   return Delete(TRUE, TRUE);
 }
 
 FX_BOOL CFX_Edit::Clear() {
   return Clear(TRUE, TRUE);
 }
 
 FX_BOOL CFX_Edit::InsertText(const FX_WCHAR* text,
-                             int32_t charset /*= DEFAULT_CHARSET*/,
-                             const CPVT_SecProps* pSecProps /*= NULL*/,
-                             const CPVT_WordProps* pWordProps /*= NULL*/) {
+                             int32_t charset,
+                             const CPVT_SecProps* pSecProps,
+                             const CPVT_WordProps* pWordProps) {
   return InsertText(text, charset, pSecProps, pWordProps, TRUE, TRUE);
 }
 
 FX_FLOAT CFX_Edit::GetFontSize() const {
   return m_pVT->GetFontSize();
 }
 
 FX_WORD CFX_Edit::GetPasswordChar() const {
   return m_pVT->GetPasswordChar();
 }
@@ skipping 11 matching lines @@
 }
 
 int32_t CFX_Edit::GetHorzScale() const {
   return m_pVT->GetHorzScale();
 }
 
 FX_FLOAT CFX_Edit::GetCharSpace() const {
   return m_pVT->GetCharSpace();
 }
 
-// inner methods
-
 CPVT_WordRange CFX_Edit::GetWholeWordRange() const {
   if (m_pVT->IsValid())
     return CPVT_WordRange(m_pVT->GetBeginWordPlace(), m_pVT->GetEndWordPlace());
 
   return CPVT_WordRange();
 }
 
 CPVT_WordRange CFX_Edit::GetVisibleWordRange() const {
   if (m_bEnableOverflow)
     return GetWholeWordRange();
@@ skipping 302 matching lines @@
   }
 }
 
 void CFX_Edit::Refresh(REFRESH_PLAN_E ePlan,
                        const CPVT_WordRange* pRange1,
                        const CPVT_WordRange* pRange2) {
   if (m_bEnableRefresh && m_pVT->IsValid()) {
     m_Refresh.BeginRefresh();
     RefreshPushLineRects(GetVisibleWordRange());
 
-    //      if (!FX_EDIT_IsFloatEqual(m_ptRefreshScrollPos.x,m_ptScrollPos.x) ||
-    //          !FX_EDIT_IsFloatEqual(m_ptRefreshScrollPos.y,m_ptScrollPos.y))
-    //      {
     m_Refresh.NoAnalyse();
     m_ptRefreshScrollPos = m_ptScrollPos;
-    //      }
-    //      else
-    //      {
-    //          switch (ePlan)
-    //          {
-    //          case RP_ANALYSE:
-    //              m_Refresh.Analyse(m_pVT->GetAlignment());
-    //
-    //              if (pRange1) RefreshPushRandomRects(*pRange1);
-    //              if (pRange2) RefreshPushRandomRects(*pRange2);
-    //              break;
-    //          case RP_NOANALYSE:
-    //              m_Refresh.NoAnalyse();
-    //              break;
-    //          case RP_OPTIONAL:
-    //              if (pRange1) RefreshPushRandomRects(*pRange1);
-    //              if (pRange2) RefreshPushRandomRects(*pRange2);
-    //              break;
-    //          }
-    //      }
 
     if (m_bNotify && m_pNotify) {
       if (!m_bNotifyFlag) {
         m_bNotifyFlag = TRUE;
         if (const CFX_Edit_RectArray* pRects = m_Refresh.GetRefreshRects()) {
           for (int32_t i = 0, sz = pRects->GetSize(); i < sz; i++)
             m_pNotify->IOnInvalidateRect(pRects->GetAt(i));
         }
         m_bNotifyFlag = FALSE;
       }
@@ skipping 19 matching lines @@
         if (lineinfo.lineplace.LineCmp(wpEnd) > 0)
           break;
 
         CPDF_Rect rcLine(lineinfo.ptLine.x,
                          lineinfo.ptLine.y + lineinfo.fLineDescent,
                          lineinfo.ptLine.x + lineinfo.fLineWidth,
                          lineinfo.ptLine.y + lineinfo.fLineAscent);
 
         m_Refresh.Push(CPVT_WordRange(lineinfo.lineplace, lineinfo.lineEnd),
                        VTToEdit(rcLine));
-
       } while (pIterator->NextLine());
     }
   }
 }
 
 void CFX_Edit::RefreshPushRandomRects(const CPVT_WordRange& wr) {
   if (m_pVT->IsValid()) {
     if (IPDF_VariableText_Iterator* pIterator = m_pVT->GetIterator()) {
       CPVT_WordRange wrTemp = wr;
 
@@ skipping 431 matching lines @@
                        const CPVT_SecProps* pSecProps,
                        const CPVT_WordProps* pWordProps,
                        FX_BOOL bAddUndo,
                        FX_BOOL bPaint) {
   Empty();
   DoInsertText(CPVT_WordPlace(0, 0, -1), text, charset, pSecProps, pWordProps);
   if (bPaint)
     Paint();
   if (m_bOprNotify && m_pOprNotify)
     m_pOprNotify->OnSetText(m_wpCaret, m_wpOldCaret);
-  // if (bAddUndo)
 }
 
 FX_BOOL CFX_Edit::InsertWord(FX_WORD word,
                              int32_t charset,
                              const CPVT_WordProps* pWordProps,
                              FX_BOOL bAddUndo,
                              FX_BOOL bPaint) {
   if (IsTextOverflow())
     return FALSE;
 
@@ skipping 533 matching lines @@
 
 void CFX_Edit::EndGroupUndo() {
   m_pGroupUndoItem->UpdateItems();
   m_Undo.AddItem(m_pGroupUndoItem);
   if (m_bOprNotify && m_pOprNotify)
     m_pOprNotify->OnAddUndo(m_pGroupUndoItem);
   m_pGroupUndoItem = NULL;
 }
 
 void CFX_Edit::AddEditUndoItem(CFX_Edit_UndoItem* pEditUndoItem) {
-  if (m_pGroupUndoItem)
+  if (m_pGroupUndoItem) {
     m_pGroupUndoItem->AddUndoItem(pEditUndoItem);
-  else {
+  } else {
     m_Undo.AddItem(pEditUndoItem);
     if (m_bOprNotify && m_pOprNotify)
       m_pOprNotify->OnAddUndo(pEditUndoItem);
   }
 }
 
 void CFX_Edit::AddUndoItem(IFX_Edit_UndoItem* pUndoItem) {
   m_Undo.AddItem(pUndoItem);
   if (m_bOprNotify && m_pOprNotify)
     m_pOprNotify->OnAddUndo(pUndoItem);
 }