CPDF_VariableText::GetIterator() never returns NULL.

fpdfsdk/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/fxedit/include/fxet_edit.h"
 
 #include <algorithm>
 
@@ skipping 730 matching lines @@
     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(CPDF_VariableText* pVT)
     : m_pVT(pVT),
-      m_pNotify(NULL),
-      m_pOprNotify(NULL),
-      m_pVTProvide(NULL),
+      m_pNotify(nullptr),
+      m_pOprNotify(nullptr),
       m_wpCaret(-1, -1, -1),
       m_wpOldCaret(-1, -1, -1),
       m_SelState(),
       m_ptScrollPos(0, 0),
       m_ptRefreshScrollPos(0, 0),
       m_bEnableScroll(FALSE),
-      m_pIterator(NULL),
+      m_pIterator(nullptr),
       m_ptCaret(0.0f, 0.0f),
       m_Undo(kEditUndoMaxItems),
       m_nAlignment(0),
       m_bNotifyFlag(FALSE),
       m_bEnableOverflow(FALSE),
       m_bEnableRefresh(TRUE),
       m_rcOldContent(0.0f, 0.0f, 0.0f, 0.0f),
       m_bEnableUndo(TRUE),
       m_bNotify(TRUE),
       m_bOprNotify(FALSE),
-      m_pGroupUndoItem(NULL) {
+      m_pGroupUndoItem(nullptr) {
   ASSERT(pVT);
 }
 
 CFX_Edit::~CFX_Edit() {
-  delete m_pVTProvide;
-  m_pVTProvide = NULL;
-  delete m_pIterator;
-  m_pIterator = NULL;
   ASSERT(!m_pGroupUndoItem);
 }
 
 void CFX_Edit::Initialize() {
   m_pVT->Initialize();
   SetCaret(m_pVT->GetBeginWordPlace());
   SetCaretOrigin();
 }
 
 void CFX_Edit::SetFontMap(IPVT_FontMap* pFontMap) {
-  delete m_pVTProvide;
-  m_pVT->SetProvider(m_pVTProvide = new CFX_Edit_Provider(pFontMap));
+  m_pVTProvider.reset(new CFX_Edit_Provider(pFontMap));
+  m_pVT->SetProvider(m_pVTProvider.get());
 }
 
 void CFX_Edit::SetNotify(IFX_Edit_Notify* pNotify) {
   m_pNotify = pNotify;
 }
 
 void CFX_Edit::SetOprNotify(IFX_Edit_OprNotify* pOprNotify) {
   m_pOprNotify = pOprNotify;
 }
 
 IFX_Edit_Iterator* CFX_Edit::GetIterator() {
   if (!m_pIterator)
-    m_pIterator = new CFX_Edit_Iterator(this, m_pVT->GetIterator());
-
-  return m_pIterator;
+    m_pIterator.reset(new CFX_Edit_Iterator(this, m_pVT->GetIterator()));
+  return m_pIterator.get();
 }
 
 CPDF_VariableText* CFX_Edit::GetVariableText() {
   return m_pVT;
 }
 
 IPVT_FontMap* CFX_Edit::GetFontMap() {
-  if (m_pVTProvide)
-    return m_pVTProvide->GetFontMap();
-
-  return NULL;
+  return m_pVTProvider ? m_pVTProvider->GetFontMap() : nullptr;
 }
 
 void CFX_Edit::SetPlateRect(const CFX_FloatRect& rect, FX_BOOL bPaint) {
   m_pVT->SetPlateRect(rect);
   m_ptScrollPos = CFX_FloatPoint(rect.left, rect.top);
   if (bPaint)
     Paint();
 }
 
 void CFX_Edit::SetAlignmentH(int32_t nFormat, FX_BOOL bPaint) {
@@ skipping 145 matching lines @@
   return -1;
 }
 
 CPVT_WordPlace CFX_Edit::GetCaretWordPlace() const {
   return m_wpCaret;
 }
 
 CFX_WideString CFX_Edit::GetText() const {
   CFX_WideString swRet;
 
-  if (m_pVT->IsValid()) {
-    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-      FX_BOOL bRich = m_pVT->IsRichText();
+  if (!m_pVT->IsValid())
+    return swRet;
 
-      pIterator->SetAt(0);
+  CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+  pIterator->SetAt(0);
 
-      CPVT_Word wordinfo;
-      CPVT_WordPlace oldplace = pIterator->GetAt();
-      while (pIterator->NextWord()) {
-        CPVT_WordPlace place = pIterator->GetAt();
+  CPVT_Word wordinfo;
+  CPVT_WordPlace oldplace = pIterator->GetAt();
+  while (pIterator->NextWord()) {
+    CPVT_WordPlace place = pIterator->GetAt();
 
-        if (pIterator->GetWord(wordinfo)) {
-          if (bRich) {
-            swRet += wordinfo.Word;
-          } else {
-            swRet += wordinfo.Word;
-          }
-        }
+    if (pIterator->GetWord(wordinfo))
+      swRet += wordinfo.Word;
 
-        if (oldplace.SecCmp(place) != 0) {
-          swRet += 0x0D;
-          swRet += 0x0A;
-        }
+    if (oldplace.SecCmp(place) != 0)
+      swRet += L"\r\n";
 
-        oldplace = place;
-      }
-    }
+    oldplace = place;
   }
 
   return swRet;
 }
 
 CFX_WideString CFX_Edit::GetRangeText(const CPVT_WordRange& range) const {
   CFX_WideString swRet;
 
-  if (m_pVT->IsValid()) {
-    FX_BOOL bRich = m_pVT->IsRichText();
+  if (!m_pVT->IsValid())
+    return swRet;
 
-    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-      CPVT_WordRange wrTemp = range;
-      m_pVT->UpdateWordPlace(wrTemp.BeginPos);
-      m_pVT->UpdateWordPlace(wrTemp.EndPos);
-      pIterator->SetAt(wrTemp.BeginPos);
+  CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+  CPVT_WordRange wrTemp = range;
+  m_pVT->UpdateWordPlace(wrTemp.BeginPos);
+  m_pVT->UpdateWordPlace(wrTemp.EndPos);
+  pIterator->SetAt(wrTemp.BeginPos);
 
-      CPVT_Word wordinfo;
-      CPVT_WordPlace oldplace = wrTemp.BeginPos;
-      while (pIterator->NextWord()) {
-        CPVT_WordPlace place = pIterator->GetAt();
-        if (place.WordCmp(wrTemp.EndPos) > 0)
-          break;
+  CPVT_Word wordinfo;
+  CPVT_WordPlace oldplace = wrTemp.BeginPos;
+  while (pIterator->NextWord()) {
+    CPVT_WordPlace place = pIterator->GetAt();
+    if (place.WordCmp(wrTemp.EndPos) > 0)
+      break;
 
-        if (pIterator->GetWord(wordinfo)) {
-          if (bRich) {
-            swRet += wordinfo.Word;
-          } else {
-            swRet += wordinfo.Word;
-          }
-        }
+    if (pIterator->GetWord(wordinfo))
+      swRet += wordinfo.Word;
 
-        if (oldplace.SecCmp(place) != 0) {
-          swRet += 0x0D;
-          swRet += 0x0A;
-        }
+    if (oldplace.SecCmp(place) != 0)
+      swRet += L"\r\n";
 
-        oldplace = place;
-      }
-    }
+    oldplace = place;
   }
 
   return swRet;
 }
 
 CFX_WideString CFX_Edit::GetSelText() const {
   return GetRangeText(m_SelState.ConvertToWordRange());
 }
 
 int32_t CFX_Edit::GetTotalWords() const {
   return m_pVT->GetTotalWords();
 }
 
 int32_t CFX_Edit::GetTotalLines() const {
-  int32_t nLines = 0;
+  int32_t nLines = 1;
 
-  if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-    pIterator->SetAt(0);
-    while (pIterator->NextLine())
-      nLines++;
-  }
+  CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+  pIterator->SetAt(0);
+  while (pIterator->NextLine())
+    ++nLines;
 
-  return nLines + 1;
+  return nLines;
 }
 
 CPVT_WordRange CFX_Edit::GetSelectWordRange() const {
   return m_SelState.ConvertToWordRange();
 }
 
 CPVT_WordRange CFX_Edit::CombineWordRange(const CPVT_WordRange& wr1,
                                           const CPVT_WordRange& wr2) {
   CPVT_WordRange wrRet;
 
@@ skipping 100 matching lines @@
 
 FX_BOOL CFX_Edit::SetRichTextAlignment(int32_t nAlignment) {
   CPVT_SecProps SecProps;
   SecProps.nAlignment = nAlignment;
   return SetRichTextProps(EP_ALIGNMENT, &SecProps, NULL);
 }
 
 FX_BOOL CFX_Edit::SetRichTextProps(EDIT_PROPS_E eProps,
                                    const CPVT_SecProps* pSecProps,
                                    const CPVT_WordProps* pWordProps) {
-  FX_BOOL bSet = FALSE;
-  FX_BOOL bSet1, bSet2;
-  if (m_pVT->IsValid() && m_pVT->IsRichText()) {
-    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-      CPVT_WordRange wrTemp = m_SelState.ConvertToWordRange();
+  if (!m_pVT->IsValid() || !m_pVT->IsRichText())
+    return FALSE;
 
-      m_pVT->UpdateWordPlace(wrTemp.BeginPos);
-      m_pVT->UpdateWordPlace(wrTemp.EndPos);
-      pIterator->SetAt(wrTemp.BeginPos);
+  CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+  CPVT_WordRange wrTemp = m_SelState.ConvertToWordRange();
 
-      BeginGroupUndo(L"");
-      bSet = SetSecProps(eProps, wrTemp.BeginPos, pSecProps, pWordProps, wrTemp,
-                         TRUE);
+  m_pVT->UpdateWordPlace(wrTemp.BeginPos);
+  m_pVT->UpdateWordPlace(wrTemp.EndPos);
+  pIterator->SetAt(wrTemp.BeginPos);
 
-      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);
+  BeginGroupUndo(L"");
+  FX_BOOL bSet =
+      SetSecProps(eProps, wrTemp.BeginPos, pSecProps, pWordProps, wrTemp, TRUE);
 
-        if (!bSet)
-          bSet = (bSet1 || bSet2);
-      }
+  while (pIterator->NextWord()) {
+    CPVT_WordPlace place = pIterator->GetAt();
+    if (place.WordCmp(wrTemp.EndPos) > 0)
+      break;
+    FX_BOOL bSet1 =
+        SetSecProps(eProps, place, pSecProps, pWordProps, wrTemp, TRUE);
+    FX_BOOL bSet2 = SetWordProps(eProps, place, pWordProps, wrTemp, TRUE);
 
-      EndGroupUndo();
+    if (!bSet)
+      bSet = (bSet1 || bSet2);
+  }
 
-      if (bSet) {
-        PaintSetProps(eProps, wrTemp);
-      }
-    }
-  }
+  EndGroupUndo();
+
+  if (bSet)
+    PaintSetProps(eProps, wrTemp);
 
   return bSet;
 }
 
 void CFX_Edit::PaintSetProps(EDIT_PROPS_E eProps, const CPVT_WordRange& wr) {
   switch (eProps) {
     case EP_LINELEADING:
     case EP_LINEINDENT:
     case EP_ALIGNMENT:
       RearrangePart(wr);
@@ skipping 26 matching lines @@
       break;
   }
 }
 
 FX_BOOL CFX_Edit::SetSecProps(EDIT_PROPS_E eProps,
                               const CPVT_WordPlace& place,
                               const CPVT_SecProps* pSecProps,
                               const CPVT_WordProps* pWordProps,
                               const CPVT_WordRange& wr,
                               FX_BOOL bAddUndo) {
-  if (m_pVT->IsValid() && m_pVT->IsRichText()) {
-    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-      FX_BOOL bSet = FALSE;
-      CPVT_Section secinfo;
-      CPVT_Section OldSecinfo;
-
-      CPVT_WordPlace oldplace = pIterator->GetAt();
-
-      if (eProps == EP_LINELEADING || eProps == EP_LINEINDENT ||
-          eProps == EP_ALIGNMENT) {
-        if (pSecProps) {
-          pIterator->SetAt(place);
-          if (pIterator->GetSection(secinfo)) {
-            if (bAddUndo)
-              OldSecinfo = secinfo;
-
-            switch (eProps) {
-              case EP_LINELEADING:
-                if (!FX_EDIT_IsFloatEqual(secinfo.SecProps.fLineLeading,
-                                          pSecProps->fLineLeading)) {
-                  secinfo.SecProps.fLineLeading = pSecProps->fLineLeading;
-                  bSet = TRUE;
-                }
-                break;
-              case EP_LINEINDENT:
-                if (!FX_EDIT_IsFloatEqual(secinfo.SecProps.fLineIndent,
-                                          pSecProps->fLineIndent)) {
-                  secinfo.SecProps.fLineIndent = pSecProps->fLineIndent;
-                  bSet = TRUE;
-                }
-                break;
-              case EP_ALIGNMENT:
-                if (secinfo.SecProps.nAlignment != pSecProps->nAlignment) {
-                  secinfo.SecProps.nAlignment = pSecProps->nAlignment;
-                  bSet = TRUE;
-                }
-                break;
-              default:
-                break;
-            }
-          }
-        }
-      } else {
-        if (pWordProps && place == m_pVT->GetSectionBeginPlace(place)) {
-          pIterator->SetAt(place);
-          if (pIterator->GetSection(secinfo)) {
-            if (bAddUndo)
-              OldSecinfo = secinfo;
-
-            switch (eProps) {
-              case EP_FONTINDEX:
-                if (secinfo.WordProps.nFontIndex != pWordProps->nFontIndex) {
-                  secinfo.WordProps.nFontIndex = pWordProps->nFontIndex;
-                  bSet = TRUE;
-                }
-                break;
-              case EP_FONTSIZE:
-                if (!FX_EDIT_IsFloatEqual(secinfo.WordProps.fFontSize,
-                                          pWordProps->fFontSize)) {
-                  secinfo.WordProps.fFontSize = pWordProps->fFontSize;
-                  bSet = TRUE;
-                }
-                break;
-              case EP_WORDCOLOR:
-                if (secinfo.WordProps.dwWordColor != pWordProps->dwWordColor) {
-                  secinfo.WordProps.dwWordColor = pWordProps->dwWordColor;
-                  bSet = TRUE;
-                }
-                break;
-              case EP_SCRIPTTYPE:
-                if (secinfo.WordProps.nScriptType != pWordProps->nScriptType) {
-                  secinfo.WordProps.nScriptType = pWordProps->nScriptType;
-                  bSet = TRUE;
-                }
-                break;
-              case EP_CHARSPACE:
-                if (!FX_EDIT_IsFloatEqual(secinfo.WordProps.fCharSpace,
-                                          pWordProps->fCharSpace)) {
-                  secinfo.WordProps.fCharSpace = pWordProps->fCharSpace;
-                  bSet = TRUE;
-                }
-                break;
-              case EP_HORZSCALE:
-                if (secinfo.WordProps.nHorzScale != pWordProps->nHorzScale) {
-                  secinfo.WordProps.nHorzScale = pWordProps->nHorzScale;
-                  bSet = TRUE;
-                }
-                break;
-              case EP_UNDERLINE:
-                if (pWordProps->nWordStyle & PVTWORD_STYLE_UNDERLINE) {
-                  if ((secinfo.WordProps.nWordStyle &
-                       PVTWORD_STYLE_UNDERLINE) == 0) {
-                    secinfo.WordProps.nWordStyle |= PVTWORD_STYLE_UNDERLINE;
-                    bSet = TRUE;
-                  }
-                } else {
-                  if ((secinfo.WordProps.nWordStyle &
-                       PVTWORD_STYLE_UNDERLINE) != 0) {
-                    secinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_UNDERLINE;
-                    bSet = TRUE;
-                  }
-                }
-                break;
-              case EP_CROSSOUT:
-                if (pWordProps->nWordStyle & PVTWORD_STYLE_CROSSOUT) {
-                  if ((secinfo.WordProps.nWordStyle & PVTWORD_STYLE_CROSSOUT) ==
-                      0) {
-                    secinfo.WordProps.nWordStyle |= PVTWORD_STYLE_CROSSOUT;
-                    bSet = TRUE;
-                  }
-                } else {
-                  if ((secinfo.WordProps.nWordStyle & PVTWORD_STYLE_CROSSOUT) !=
-                      0) {
-                    secinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_CROSSOUT;
-                    bSet = TRUE;
-                  }
-                }
-                break;
-              case EP_BOLD:
-                if (pWordProps->nWordStyle & PVTWORD_STYLE_BOLD) {
-                  if ((secinfo.WordProps.nWordStyle & PVTWORD_STYLE_BOLD) ==
-                      0) {
-                    secinfo.WordProps.nWordStyle |= PVTWORD_STYLE_BOLD;
-                    bSet = TRUE;
-                  }
-                } else {
-                  if ((secinfo.WordProps.nWordStyle & PVTWORD_STYLE_BOLD) !=
-                      0) {
-                    secinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_BOLD;
-                    bSet = TRUE;
-                  }
-                }
-                break;
-              case EP_ITALIC:
-                if (pWordProps->nWordStyle & PVTWORD_STYLE_ITALIC) {
-                  if ((secinfo.WordProps.nWordStyle & PVTWORD_STYLE_ITALIC) ==
-                      0) {
-                    secinfo.WordProps.nWordStyle |= PVTWORD_STYLE_ITALIC;
-                    bSet = TRUE;
-                  }
-                } else {
-                  if ((secinfo.WordProps.nWordStyle & PVTWORD_STYLE_ITALIC) !=
-                      0) {
-                    secinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_ITALIC;
-                    bSet = TRUE;
-                  }
-                }
-                break;
-              default:
-                break;
-            }
-          }
+  if (!m_pVT->IsValid() || !m_pVT->IsRichText())
+    return FALSE;
+
+  CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+  FX_BOOL bSet = FALSE;
+  CPVT_Section secinfo;
+  CPVT_Section OldSecinfo;
+
+  CPVT_WordPlace oldplace = pIterator->GetAt();
+
+  if (eProps == EP_LINELEADING || eProps == EP_LINEINDENT ||
+      eProps == EP_ALIGNMENT) {
+    if (pSecProps) {
+      pIterator->SetAt(place);
+      if (pIterator->GetSection(secinfo)) {
+        if (bAddUndo)
+          OldSecinfo = secinfo;
+
+        switch (eProps) {
+          case EP_LINELEADING:
+            if (!FX_EDIT_IsFloatEqual(secinfo.SecProps.fLineLeading,
+                                      pSecProps->fLineLeading)) {
+              secinfo.SecProps.fLineLeading = pSecProps->fLineLeading;
+              bSet = TRUE;
+            }
+            break;
+          case EP_LINEINDENT:
+            if (!FX_EDIT_IsFloatEqual(secinfo.SecProps.fLineIndent,
+                                      pSecProps->fLineIndent)) {
+              secinfo.SecProps.fLineIndent = pSecProps->fLineIndent;
+              bSet = TRUE;
+            }
+            break;
+          case EP_ALIGNMENT:
+            if (secinfo.SecProps.nAlignment != pSecProps->nAlignment) {
+              secinfo.SecProps.nAlignment = pSecProps->nAlignment;
+              bSet = TRUE;
+            }
+            break;
+          default:
+            break;
         }
       }
-
-      if (bSet) {
-        pIterator->SetSection(secinfo);
-
-        if (bAddUndo && m_bEnableUndo) {
-          AddEditUndoItem(new CFXEU_SetSecProps(
-              this, place, eProps, OldSecinfo.SecProps, OldSecinfo.WordProps,
-              secinfo.SecProps, secinfo.WordProps, wr));
+    }
+  } else {
+    if (pWordProps && place == m_pVT->GetSectionBeginPlace(place)) {
+      pIterator->SetAt(place);
+      if (pIterator->GetSection(secinfo)) {
+        if (bAddUndo)
+          OldSecinfo = secinfo;
+
+        switch (eProps) {
+          case EP_FONTINDEX:
+            if (secinfo.WordProps.nFontIndex != pWordProps->nFontIndex) {
+              secinfo.WordProps.nFontIndex = pWordProps->nFontIndex;
+              bSet = TRUE;
+            }
+            break;
+          case EP_FONTSIZE:
+            if (!FX_EDIT_IsFloatEqual(secinfo.WordProps.fFontSize,
+                                      pWordProps->fFontSize)) {
+              secinfo.WordProps.fFontSize = pWordProps->fFontSize;
+              bSet = TRUE;
+            }
+            break;
+          case EP_WORDCOLOR:
+            if (secinfo.WordProps.dwWordColor != pWordProps->dwWordColor) {
+              secinfo.WordProps.dwWordColor = pWordProps->dwWordColor;
+              bSet = TRUE;
+            }
+            break;
+          case EP_SCRIPTTYPE:
+            if (secinfo.WordProps.nScriptType != pWordProps->nScriptType) {
+              secinfo.WordProps.nScriptType = pWordProps->nScriptType;
+              bSet = TRUE;
+            }
+            break;
+          case EP_CHARSPACE:
+            if (!FX_EDIT_IsFloatEqual(secinfo.WordProps.fCharSpace,
+                                      pWordProps->fCharSpace)) {
+              secinfo.WordProps.fCharSpace = pWordProps->fCharSpace;
+              bSet = TRUE;
+            }
+            break;
+          case EP_HORZSCALE:
+            if (secinfo.WordProps.nHorzScale != pWordProps->nHorzScale) {
+              secinfo.WordProps.nHorzScale = pWordProps->nHorzScale;
+              bSet = TRUE;
+            }
+            break;
+          case EP_UNDERLINE:
+            if (pWordProps->nWordStyle & PVTWORD_STYLE_UNDERLINE) {
+              if ((secinfo.WordProps.nWordStyle & PVTWORD_STYLE_UNDERLINE) ==
+                  0) {
+                secinfo.WordProps.nWordStyle |= PVTWORD_STYLE_UNDERLINE;
+                bSet = TRUE;
+              }
+            } else {
+              if ((secinfo.WordProps.nWordStyle & PVTWORD_STYLE_UNDERLINE) !=
+                  0) {
+                secinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_UNDERLINE;
+                bSet = TRUE;
+              }
+            }
+            break;
+          case EP_CROSSOUT:
+            if (pWordProps->nWordStyle & PVTWORD_STYLE_CROSSOUT) {
+              if ((secinfo.WordProps.nWordStyle & PVTWORD_STYLE_CROSSOUT) ==
+                  0) {
+                secinfo.WordProps.nWordStyle |= PVTWORD_STYLE_CROSSOUT;
+                bSet = TRUE;
+              }
+            } else {
+              if ((secinfo.WordProps.nWordStyle & PVTWORD_STYLE_CROSSOUT) !=
+                  0) {
+                secinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_CROSSOUT;
+                bSet = TRUE;
+              }
+            }
+            break;
+          case EP_BOLD:
+            if (pWordProps->nWordStyle & PVTWORD_STYLE_BOLD) {
+              if ((secinfo.WordProps.nWordStyle & PVTWORD_STYLE_BOLD) == 0) {
+                secinfo.WordProps.nWordStyle |= PVTWORD_STYLE_BOLD;
+                bSet = TRUE;
+              }
+            } else {
+              if ((secinfo.WordProps.nWordStyle & PVTWORD_STYLE_BOLD) != 0) {
+                secinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_BOLD;
+                bSet = TRUE;
+              }
+            }
+            break;
+          case EP_ITALIC:
+            if (pWordProps->nWordStyle & PVTWORD_STYLE_ITALIC) {
+              if ((secinfo.WordProps.nWordStyle & PVTWORD_STYLE_ITALIC) == 0) {
+                secinfo.WordProps.nWordStyle |= PVTWORD_STYLE_ITALIC;
+                bSet = TRUE;
+              }
+            } else {
+              if ((secinfo.WordProps.nWordStyle & PVTWORD_STYLE_ITALIC) != 0) {
+                secinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_ITALIC;
+                bSet = TRUE;
+              }
+            }
+            break;
+          default:
+            break;
         }
       }
-
-      pIterator->SetAt(oldplace);
-
-      return bSet;
     }
   }
 
-  return FALSE;
+  if (bSet) {
+    pIterator->SetSection(secinfo);
+
+    if (bAddUndo && m_bEnableUndo) {
+      AddEditUndoItem(new CFXEU_SetSecProps(
+          this, place, eProps, OldSecinfo.SecProps, OldSecinfo.WordProps,
+          secinfo.SecProps, secinfo.WordProps, wr));
+    }
+  }
+
+  pIterator->SetAt(oldplace);
+
+  return bSet;
 }
 
 FX_BOOL CFX_Edit::SetWordProps(EDIT_PROPS_E eProps,
                                const CPVT_WordPlace& place,
                                const CPVT_WordProps* pWordProps,
                                const CPVT_WordRange& wr,
                                FX_BOOL bAddUndo) {
-  if (m_pVT->IsValid() && m_pVT->IsRichText()) {
-    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-      FX_BOOL bSet = FALSE;
-      CPVT_Word wordinfo;
-      CPVT_Word OldWordinfo;
-
-      CPVT_WordPlace oldplace = pIterator->GetAt();
-
-      if (pWordProps) {
-        pIterator->SetAt(place);
-        if (pIterator->GetWord(wordinfo)) {
-          if (bAddUndo)
-            OldWordinfo = wordinfo;
-
-          switch (eProps) {
-            case EP_FONTINDEX:
-              if (wordinfo.WordProps.nFontIndex != pWordProps->nFontIndex) {
-                if (IPVT_FontMap* pFontMap = GetFontMap()) {
-                  wordinfo.WordProps.nFontIndex = pFontMap->GetWordFontIndex(
-                      wordinfo.Word, wordinfo.nCharset, pWordProps->nFontIndex);
-                }
-                bSet = TRUE;
-              }
-              break;
-            case EP_FONTSIZE:
-              if (!FX_EDIT_IsFloatEqual(wordinfo.WordProps.fFontSize,
-                                        pWordProps->fFontSize)) {
-                wordinfo.WordProps.fFontSize = pWordProps->fFontSize;
-                bSet = TRUE;
-              }
-              break;
-            case EP_WORDCOLOR:
-              if (wordinfo.WordProps.dwWordColor != pWordProps->dwWordColor) {
-                wordinfo.WordProps.dwWordColor = pWordProps->dwWordColor;
-                bSet = TRUE;
-              }
-              break;
-            case EP_SCRIPTTYPE:
-              if (wordinfo.WordProps.nScriptType != pWordProps->nScriptType) {
-                wordinfo.WordProps.nScriptType = pWordProps->nScriptType;
-                bSet = TRUE;
-              }
-              break;
-            case EP_CHARSPACE:
-              if (!FX_EDIT_IsFloatEqual(wordinfo.WordProps.fCharSpace,
-                                        pWordProps->fCharSpace)) {
-                wordinfo.WordProps.fCharSpace = pWordProps->fCharSpace;
-                bSet = TRUE;
-              }
-              break;
-            case EP_HORZSCALE:
-              if (wordinfo.WordProps.nHorzScale != pWordProps->nHorzScale) {
-                wordinfo.WordProps.nHorzScale = pWordProps->nHorzScale;
-                bSet = TRUE;
-              }
-              break;
-            case EP_UNDERLINE:
-              if (pWordProps->nWordStyle & PVTWORD_STYLE_UNDERLINE) {
-                if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_UNDERLINE) ==
-                    0) {
-                  wordinfo.WordProps.nWordStyle |= PVTWORD_STYLE_UNDERLINE;
-                  bSet = TRUE;
-                }
-              } else {
-                if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_UNDERLINE) !=
-                    0) {
-                  wordinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_UNDERLINE;
-                  bSet = TRUE;
-                }
-              }
-              break;
-            case EP_CROSSOUT:
-              if (pWordProps->nWordStyle & PVTWORD_STYLE_CROSSOUT) {
-                if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_CROSSOUT) ==
-                    0) {
-                  wordinfo.WordProps.nWordStyle |= PVTWORD_STYLE_CROSSOUT;
-                  bSet = TRUE;
-                }
-              } else {
-                if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_CROSSOUT) !=
-                    0) {
-                  wordinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_CROSSOUT;
-                  bSet = TRUE;
-                }
-              }
-              break;
-            case EP_BOLD:
-              if (pWordProps->nWordStyle & PVTWORD_STYLE_BOLD) {
-                if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_BOLD) == 0) {
-                  wordinfo.WordProps.nWordStyle |= PVTWORD_STYLE_BOLD;
-                  bSet = TRUE;
-                }
-              } else {
-                if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_BOLD) != 0) {
-                  wordinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_BOLD;
-                  bSet = TRUE;
-                }
-              }
-              break;
-            case EP_ITALIC:
-              if (pWordProps->nWordStyle & PVTWORD_STYLE_ITALIC) {
-                if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_ITALIC) ==
-                    0) {
-                  wordinfo.WordProps.nWordStyle |= PVTWORD_STYLE_ITALIC;
-                  bSet = TRUE;
-                }
-              } else {
-                if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_ITALIC) !=
-                    0) {
-                  wordinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_ITALIC;
-                  bSet = TRUE;
-                }
-              }
-              break;
-            default:
-              break;
-          }
-        }
+  if (!m_pVT->IsValid() || !m_pVT->IsRichText())
+    return FALSE;
+
+  CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+  FX_BOOL bSet = FALSE;
+  CPVT_Word wordinfo;
+  CPVT_Word OldWordinfo;
+
+  CPVT_WordPlace oldplace = pIterator->GetAt();
+
+  if (pWordProps) {
+    pIterator->SetAt(place);
+    if (pIterator->GetWord(wordinfo)) {
+      if (bAddUndo)
+        OldWordinfo = wordinfo;
+
+      switch (eProps) {
+        case EP_FONTINDEX:
+          if (wordinfo.WordProps.nFontIndex != pWordProps->nFontIndex) {
+            if (IPVT_FontMap* pFontMap = GetFontMap()) {
+              wordinfo.WordProps.nFontIndex = pFontMap->GetWordFontIndex(
+                  wordinfo.Word, wordinfo.nCharset, pWordProps->nFontIndex);
+            }
+            bSet = TRUE;
+          }
+          break;
+        case EP_FONTSIZE:
+          if (!FX_EDIT_IsFloatEqual(wordinfo.WordProps.fFontSize,
+                                    pWordProps->fFontSize)) {
+            wordinfo.WordProps.fFontSize = pWordProps->fFontSize;
+            bSet = TRUE;
+          }
+          break;
+        case EP_WORDCOLOR:
+          if (wordinfo.WordProps.dwWordColor != pWordProps->dwWordColor) {
+            wordinfo.WordProps.dwWordColor = pWordProps->dwWordColor;
+            bSet = TRUE;
+          }
+          break;
+        case EP_SCRIPTTYPE:
+          if (wordinfo.WordProps.nScriptType != pWordProps->nScriptType) {
+            wordinfo.WordProps.nScriptType = pWordProps->nScriptType;
+            bSet = TRUE;
+          }
+          break;
+        case EP_CHARSPACE:
+          if (!FX_EDIT_IsFloatEqual(wordinfo.WordProps.fCharSpace,
+                                    pWordProps->fCharSpace)) {
+            wordinfo.WordProps.fCharSpace = pWordProps->fCharSpace;
+            bSet = TRUE;
+          }
+          break;
+        case EP_HORZSCALE:
+          if (wordinfo.WordProps.nHorzScale != pWordProps->nHorzScale) {
+            wordinfo.WordProps.nHorzScale = pWordProps->nHorzScale;
+            bSet = TRUE;
+          }
+          break;
+        case EP_UNDERLINE:
+          if (pWordProps->nWordStyle & PVTWORD_STYLE_UNDERLINE) {
+            if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_UNDERLINE) ==
+                0) {
+              wordinfo.WordProps.nWordStyle |= PVTWORD_STYLE_UNDERLINE;
+              bSet = TRUE;
+            }
+          } else {
+            if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_UNDERLINE) !=
+                0) {
+              wordinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_UNDERLINE;
+              bSet = TRUE;
+            }
+          }
+          break;
+        case EP_CROSSOUT:
+          if (pWordProps->nWordStyle & PVTWORD_STYLE_CROSSOUT) {
+            if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_CROSSOUT) == 0) {
+              wordinfo.WordProps.nWordStyle |= PVTWORD_STYLE_CROSSOUT;
+              bSet = TRUE;
+            }
+          } else {
+            if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_CROSSOUT) != 0) {
+              wordinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_CROSSOUT;
+              bSet = TRUE;
+            }
+          }
+          break;
+        case EP_BOLD:
+          if (pWordProps->nWordStyle & PVTWORD_STYLE_BOLD) {
+            if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_BOLD) == 0) {
+              wordinfo.WordProps.nWordStyle |= PVTWORD_STYLE_BOLD;
+              bSet = TRUE;
+            }
+          } else {
+            if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_BOLD) != 0) {
+              wordinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_BOLD;
+              bSet = TRUE;
+            }
+          }
+          break;
+        case EP_ITALIC:
+          if (pWordProps->nWordStyle & PVTWORD_STYLE_ITALIC) {
+            if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_ITALIC) == 0) {
+              wordinfo.WordProps.nWordStyle |= PVTWORD_STYLE_ITALIC;
+              bSet = TRUE;
+            }
+          } else {
+            if ((wordinfo.WordProps.nWordStyle & PVTWORD_STYLE_ITALIC) != 0) {
+              wordinfo.WordProps.nWordStyle &= ~PVTWORD_STYLE_ITALIC;
+              bSet = TRUE;
+            }
+          }
+          break;
+        default:
+          break;
       }
-
-      if (bSet) {
-        pIterator->SetWord(wordinfo);
-
-        if (bAddUndo && m_bEnableUndo) {
-          AddEditUndoItem(new CFXEU_SetWordProps(this, place, eProps,
-                                                 OldWordinfo.WordProps,
-                                                 wordinfo.WordProps, wr));
-        }
-      }
-
-      pIterator->SetAt(oldplace);
-      return bSet;
     }
   }
 
-  return FALSE;
+  if (bSet) {
+    pIterator->SetWord(wordinfo);
+
+    if (bAddUndo && m_bEnableUndo) {
+      AddEditUndoItem(new CFXEU_SetWordProps(
+          this, place, eProps, OldWordinfo.WordProps, wordinfo.WordProps, wr));
+    }
+  }
+
+  pIterator->SetAt(oldplace);
+  return bSet;
 }
 
 void CFX_Edit::SetText(const FX_WCHAR* text,
                        int32_t charset,
                        const CPVT_SecProps* pSecProps,
                        const CPVT_WordProps* pWordProps) {
   SetText(text, charset, pSecProps, pWordProps, TRUE, TRUE);
 }
 
 FX_BOOL CFX_Edit::InsertWord(uint16_t word,
@@ skipping 315 matching lines @@
       } else if (FX_EDIT_IsFloatBigger(m_ptScrollPos.y, rcContent.top)) {
         SetScrollPosY(rcContent.top);
       }
     }
   }
 }
 
 void CFX_Edit::ScrollToCaret() {
   SetScrollLimit();
 
-  if (m_pVT->IsValid()) {
-    CFX_FloatPoint ptHead(0, 0);
-    CFX_FloatPoint ptFoot(0, 0);
+  if (!m_pVT->IsValid())
+    return;
 
-    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-      pIterator->SetAt(m_wpCaret);
+  CFX_FloatPoint ptHead(0, 0);
+  CFX_FloatPoint ptFoot(0, 0);
 
-      CPVT_Word word;
-      CPVT_Line line;
-      if (pIterator->GetWord(word)) {
-        ptHead.x = word.ptWord.x + word.fWidth;
-        ptHead.y = word.ptWord.y + word.fAscent;
-        ptFoot.x = word.ptWord.x + word.fWidth;
-        ptFoot.y = word.ptWord.y + word.fDescent;
-      } else if (pIterator->GetLine(line)) {
-        ptHead.x = line.ptLine.x;
-        ptHead.y = line.ptLine.y + line.fLineAscent;
-        ptFoot.x = line.ptLine.x;
-        ptFoot.y = line.ptLine.y + line.fLineDescent;
+  CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+  pIterator->SetAt(m_wpCaret);
+
+  CPVT_Word word;
+  CPVT_Line line;
+  if (pIterator->GetWord(word)) {
+    ptHead.x = word.ptWord.x + word.fWidth;
+    ptHead.y = word.ptWord.y + word.fAscent;
+    ptFoot.x = word.ptWord.x + word.fWidth;
+    ptFoot.y = word.ptWord.y + word.fDescent;
+  } else if (pIterator->GetLine(line)) {
+    ptHead.x = line.ptLine.x;
+    ptHead.y = line.ptLine.y + line.fLineAscent;
+    ptFoot.x = line.ptLine.x;
+    ptFoot.y = line.ptLine.y + line.fLineDescent;
+  }
+
+  CFX_FloatPoint ptHeadEdit = VTToEdit(ptHead);
+  CFX_FloatPoint ptFootEdit = VTToEdit(ptFoot);
+
+  CFX_FloatRect rcPlate = m_pVT->GetPlateRect();
+
+  if (!FX_EDIT_IsFloatEqual(rcPlate.left, rcPlate.right)) {
+    if (FX_EDIT_IsFloatSmaller(ptHeadEdit.x, rcPlate.left) ||
+        FX_EDIT_IsFloatEqual(ptHeadEdit.x, rcPlate.left)) {
+      SetScrollPosX(ptHead.x);
+    } else if (FX_EDIT_IsFloatBigger(ptHeadEdit.x, rcPlate.right)) {
+      SetScrollPosX(ptHead.x - rcPlate.Width());
+    }
+  }
+
+  if (!FX_EDIT_IsFloatEqual(rcPlate.top, rcPlate.bottom)) {
+    if (FX_EDIT_IsFloatSmaller(ptFootEdit.y, rcPlate.bottom) ||
+        FX_EDIT_IsFloatEqual(ptFootEdit.y, rcPlate.bottom)) {
+      if (FX_EDIT_IsFloatSmaller(ptHeadEdit.y, rcPlate.top)) {
+        SetScrollPosY(ptFoot.y + rcPlate.Height());
       }
-    }
-
-    CFX_FloatPoint ptHeadEdit = VTToEdit(ptHead);
-    CFX_FloatPoint ptFootEdit = VTToEdit(ptFoot);
-
-    CFX_FloatRect rcPlate = m_pVT->GetPlateRect();
-
-    if (!FX_EDIT_IsFloatEqual(rcPlate.left, rcPlate.right)) {
-      if (FX_EDIT_IsFloatSmaller(ptHeadEdit.x, rcPlate.left) ||
-          FX_EDIT_IsFloatEqual(ptHeadEdit.x, rcPlate.left)) {
-        SetScrollPosX(ptHead.x);
-      } else if (FX_EDIT_IsFloatBigger(ptHeadEdit.x, rcPlate.right)) {
-        SetScrollPosX(ptHead.x - rcPlate.Width());
-      }
-    }
-
-    if (!FX_EDIT_IsFloatEqual(rcPlate.top, rcPlate.bottom)) {
-      if (FX_EDIT_IsFloatSmaller(ptFootEdit.y, rcPlate.bottom) ||
-          FX_EDIT_IsFloatEqual(ptFootEdit.y, rcPlate.bottom)) {
-        if (FX_EDIT_IsFloatSmaller(ptHeadEdit.y, rcPlate.top)) {
-          SetScrollPosY(ptFoot.y + rcPlate.Height());
-        }
-      } else if (FX_EDIT_IsFloatBigger(ptHeadEdit.y, rcPlate.top)) {
-        if (FX_EDIT_IsFloatBigger(ptFootEdit.y, rcPlate.bottom)) {
-          SetScrollPosY(ptHead.y);
-        }
+    } else if (FX_EDIT_IsFloatBigger(ptHeadEdit.y, rcPlate.top)) {
+      if (FX_EDIT_IsFloatBigger(ptFootEdit.y, rcPlate.bottom)) {
+        SetScrollPosY(ptHead.y);
       }
     }
   }
 }
 
 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();
@@ skipping 11 matching lines @@
         }
         m_bNotifyFlag = FALSE;
       }
     }
 
     m_Refresh.EndRefresh();
   }
 }
 
 void CFX_Edit::RefreshPushLineRects(const CPVT_WordRange& wr) {
-  if (m_pVT->IsValid()) {
-    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-      CPVT_WordPlace wpBegin = wr.BeginPos;
-      m_pVT->UpdateWordPlace(wpBegin);
-      CPVT_WordPlace wpEnd = wr.EndPos;
-      m_pVT->UpdateWordPlace(wpEnd);
-      pIterator->SetAt(wpBegin);
+  if (!m_pVT->IsValid())
+    return;
 
-      CPVT_Line lineinfo;
-      do {
-        if (!pIterator->GetLine(lineinfo))
-          break;
-        if (lineinfo.lineplace.LineCmp(wpEnd) > 0)
-          break;
+  CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+  CPVT_WordPlace wpBegin = wr.BeginPos;
+  m_pVT->UpdateWordPlace(wpBegin);
+  CPVT_WordPlace wpEnd = wr.EndPos;
+  m_pVT->UpdateWordPlace(wpEnd);
+  pIterator->SetAt(wpBegin);
 
-        CFX_FloatRect rcLine(lineinfo.ptLine.x,
-                             lineinfo.ptLine.y + lineinfo.fLineDescent,
-                             lineinfo.ptLine.x + lineinfo.fLineWidth,
-                             lineinfo.ptLine.y + lineinfo.fLineAscent);
+  CPVT_Line lineinfo;
+  do {
+    if (!pIterator->GetLine(lineinfo))
+      break;
+    if (lineinfo.lineplace.LineCmp(wpEnd) > 0)
+      break;
 
-        m_Refresh.Push(CPVT_WordRange(lineinfo.lineplace, lineinfo.lineEnd),
-                       VTToEdit(rcLine));
-      } while (pIterator->NextLine());
-    }
-  }
+    CFX_FloatRect 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 (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-      CPVT_WordRange wrTemp = wr;
+  if (!m_pVT->IsValid())
+    return;
 
-      m_pVT->UpdateWordPlace(wrTemp.BeginPos);
-      m_pVT->UpdateWordPlace(wrTemp.EndPos);
-      pIterator->SetAt(wrTemp.BeginPos);
+  CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+  CPVT_WordRange wrTemp = wr;
 
-      CPVT_Word wordinfo;
-      CPVT_Line lineinfo;
-      CPVT_WordPlace place;
+  m_pVT->UpdateWordPlace(wrTemp.BeginPos);
+  m_pVT->UpdateWordPlace(wrTemp.EndPos);
+  pIterator->SetAt(wrTemp.BeginPos);
 
-      while (pIterator->NextWord()) {
-        place = pIterator->GetAt();
-        if (place.WordCmp(wrTemp.EndPos) > 0)
-          break;
+  CPVT_Word wordinfo;
+  CPVT_Line lineinfo;
+  CPVT_WordPlace place;
 
-        pIterator->GetWord(wordinfo);
-        pIterator->GetLine(lineinfo);
+  while (pIterator->NextWord()) {
+    place = pIterator->GetAt();
+    if (place.WordCmp(wrTemp.EndPos) > 0)
+      break;
 
-        if (place.LineCmp(wrTemp.BeginPos) == 0 ||
-            place.LineCmp(wrTemp.EndPos) == 0) {
-          CFX_FloatRect rcWord(wordinfo.ptWord.x,
-                               lineinfo.ptLine.y + lineinfo.fLineDescent,
-                               wordinfo.ptWord.x + wordinfo.fWidth,
-                               lineinfo.ptLine.y + lineinfo.fLineAscent);
+    pIterator->GetWord(wordinfo);
+    pIterator->GetLine(lineinfo);
 
-          m_Refresh.AddRefresh(VTToEdit(rcWord));
-        } else {
-          CFX_FloatRect rcLine(lineinfo.ptLine.x,
-                               lineinfo.ptLine.y + lineinfo.fLineDescent,
-                               lineinfo.ptLine.x + lineinfo.fLineWidth,
-                               lineinfo.ptLine.y + lineinfo.fLineAscent);
+    if (place.LineCmp(wrTemp.BeginPos) == 0 ||
+        place.LineCmp(wrTemp.EndPos) == 0) {
+      CFX_FloatRect rcWord(wordinfo.ptWord.x,
+                           lineinfo.ptLine.y + lineinfo.fLineDescent,
+                           wordinfo.ptWord.x + wordinfo.fWidth,
+                           lineinfo.ptLine.y + lineinfo.fLineAscent);
 
-          m_Refresh.AddRefresh(VTToEdit(rcLine));
+      m_Refresh.AddRefresh(VTToEdit(rcWord));
+    } else {
+      CFX_FloatRect rcLine(lineinfo.ptLine.x,
+                           lineinfo.ptLine.y + lineinfo.fLineDescent,
+                           lineinfo.ptLine.x + lineinfo.fLineWidth,
+                           lineinfo.ptLine.y + lineinfo.fLineAscent);
 
-          pIterator->NextLine();
-        }
-      }
+      m_Refresh.AddRefresh(VTToEdit(rcLine));
+
+      pIterator->NextLine();
     }
   }
 }
 
 void CFX_Edit::RefreshWordRange(const CPVT_WordRange& wr) {
-  if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-    CPVT_WordRange wrTemp = wr;
+  CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+  CPVT_WordRange wrTemp = wr;
 
-    m_pVT->UpdateWordPlace(wrTemp.BeginPos);
-    m_pVT->UpdateWordPlace(wrTemp.EndPos);
-    pIterator->SetAt(wrTemp.BeginPos);
+  m_pVT->UpdateWordPlace(wrTemp.BeginPos);
+  m_pVT->UpdateWordPlace(wrTemp.EndPos);
+  pIterator->SetAt(wrTemp.BeginPos);
 
-    CPVT_Word wordinfo;
-    CPVT_Line lineinfo;
-    CPVT_WordPlace place;
+  CPVT_Word wordinfo;
+  CPVT_Line lineinfo;
+  CPVT_WordPlace place;
 
-    while (pIterator->NextWord()) {
-      place = pIterator->GetAt();
-      if (place.WordCmp(wrTemp.EndPos) > 0)
-        break;
+  while (pIterator->NextWord()) {
+    place = pIterator->GetAt();
+    if (place.WordCmp(wrTemp.EndPos) > 0)
+      break;
 
-      pIterator->GetWord(wordinfo);
-      pIterator->GetLine(lineinfo);
+    pIterator->GetWord(wordinfo);
+    pIterator->GetLine(lineinfo);
 
-      if (place.LineCmp(wrTemp.BeginPos) == 0 ||
-          place.LineCmp(wrTemp.EndPos) == 0) {
-        CFX_FloatRect rcWord(wordinfo.ptWord.x,
-                             lineinfo.ptLine.y + lineinfo.fLineDescent,
-                             wordinfo.ptWord.x + wordinfo.fWidth,
-                             lineinfo.ptLine.y + lineinfo.fLineAscent);
+    if (place.LineCmp(wrTemp.BeginPos) == 0 ||
+        place.LineCmp(wrTemp.EndPos) == 0) {
+      CFX_FloatRect rcWord(wordinfo.ptWord.x,
+                           lineinfo.ptLine.y + lineinfo.fLineDescent,
+                           wordinfo.ptWord.x + wordinfo.fWidth,
+                           lineinfo.ptLine.y + lineinfo.fLineAscent);
 
-        if (m_bNotify && m_pNotify) {
-          if (!m_bNotifyFlag) {
-            m_bNotifyFlag = TRUE;
-            CFX_FloatRect rcRefresh = VTToEdit(rcWord);
-            m_pNotify->IOnInvalidateRect(&rcRefresh);
-            m_bNotifyFlag = FALSE;
-          }
+      if (m_bNotify && m_pNotify) {
+        if (!m_bNotifyFlag) {
+          m_bNotifyFlag = TRUE;
+          CFX_FloatRect rcRefresh = VTToEdit(rcWord);
+          m_pNotify->IOnInvalidateRect(&rcRefresh);
+          m_bNotifyFlag = FALSE;
         }
-      } else {
-        CFX_FloatRect rcLine(lineinfo.ptLine.x,
-                             lineinfo.ptLine.y + lineinfo.fLineDescent,
-                             lineinfo.ptLine.x + lineinfo.fLineWidth,
-                             lineinfo.ptLine.y + lineinfo.fLineAscent);
+      }
+    } else {
+      CFX_FloatRect rcLine(lineinfo.ptLine.x,
+                           lineinfo.ptLine.y + lineinfo.fLineDescent,
+                           lineinfo.ptLine.x + lineinfo.fLineWidth,
+                           lineinfo.ptLine.y + lineinfo.fLineAscent);
 
-        if (m_bNotify && m_pNotify) {
-          if (!m_bNotifyFlag) {
-            m_bNotifyFlag = TRUE;
-            CFX_FloatRect rcRefresh = VTToEdit(rcLine);
-            m_pNotify->IOnInvalidateRect(&rcRefresh);
-            m_bNotifyFlag = FALSE;
-          }
+      if (m_bNotify && m_pNotify) {
+        if (!m_bNotifyFlag) {
+          m_bNotifyFlag = TRUE;
+          CFX_FloatRect rcRefresh = VTToEdit(rcLine);
+          m_pNotify->IOnInvalidateRect(&rcRefresh);
+          m_bNotifyFlag = FALSE;
         }
+      }
 
-        pIterator->NextLine();
-      }
+      pIterator->NextLine();
     }
   }
 }
 
 void CFX_Edit::SetCaret(const CPVT_WordPlace& place) {
   m_wpOldCaret = m_wpCaret;
   m_wpCaret = place;
 }
 
 void CFX_Edit::SetCaretInfo() {
   if (m_bNotify && m_pNotify) {
     if (!m_bNotifyFlag) {
       CFX_FloatPoint ptHead(0.0f, 0.0f), ptFoot(0.0f, 0.0f);
 
-      if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-        pIterator->SetAt(m_wpCaret);
-        CPVT_Word word;
-        CPVT_Line line;
-        if (pIterator->GetWord(word)) {
-          ptHead.x = word.ptWord.x + word.fWidth;
-          ptHead.y = word.ptWord.y + word.fAscent;
-          ptFoot.x = word.ptWord.x + word.fWidth;
-          ptFoot.y = word.ptWord.y + word.fDescent;
-        } else if (pIterator->GetLine(line)) {
-          ptHead.x = line.ptLine.x;
-          ptHead.y = line.ptLine.y + line.fLineAscent;
-          ptFoot.x = line.ptLine.x;
-          ptFoot.y = line.ptLine.y + line.fLineDescent;
-        }
+      CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+      pIterator->SetAt(m_wpCaret);
+      CPVT_Word word;
+      CPVT_Line line;
+      if (pIterator->GetWord(word)) {
+        ptHead.x = word.ptWord.x + word.fWidth;
+        ptHead.y = word.ptWord.y + word.fAscent;
+        ptFoot.x = word.ptWord.x + word.fWidth;
+        ptFoot.y = word.ptWord.y + word.fDescent;
+      } else if (pIterator->GetLine(line)) {
+        ptHead.x = line.ptLine.x;
+        ptHead.y = line.ptLine.y + line.fLineAscent;
+        ptFoot.x = line.ptLine.x;
+        ptFoot.y = line.ptLine.y + line.fLineDescent;
       }
 
       m_bNotifyFlag = TRUE;
       m_pNotify->IOnSetCaret(!m_SelState.IsExist(), VTToEdit(ptHead),
                              VTToEdit(ptFoot), m_wpCaret);
       m_bNotifyFlag = FALSE;
     }
   }
 
   SetCaretChange();
 }
 
 void CFX_Edit::SetCaretChange() {
   if (m_wpCaret == m_wpOldCaret)
     return;
 
-  if (m_bNotify && m_pVT->IsRichText() && m_pNotify) {
-    CPVT_SecProps SecProps;
-    CPVT_WordProps WordProps;
+  if (!m_bNotify || !m_pVT->IsRichText() || !m_pNotify)
+    return;
 
-    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-      pIterator->SetAt(m_wpCaret);
-      CPVT_Word word;
-      CPVT_Section section;
+  CPVT_SecProps SecProps;
+  CPVT_WordProps WordProps;
 
-      if (pIterator->GetSection(section)) {
-        SecProps = section.SecProps;
-        WordProps = section.WordProps;
-      }
+  CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+  pIterator->SetAt(m_wpCaret);
+  CPVT_Word word;
+  CPVT_Section section;
 
-      if (pIterator->GetWord(word)) {
-        WordProps = word.WordProps;
-      }
-    }
+  if (pIterator->GetSection(section)) {
+    SecProps = section.SecProps;
+    WordProps = section.WordProps;
+  }
 
-    if (!m_bNotifyFlag) {
-      m_bNotifyFlag = TRUE;
-      m_pNotify->IOnCaretChange(SecProps, WordProps);
-      m_bNotifyFlag = FALSE;
-    }
+  if (pIterator->GetWord(word))
+    WordProps = word.WordProps;
+
+  if (!m_bNotifyFlag) {
+    m_bNotifyFlag = TRUE;
+    m_pNotify->IOnCaretChange(SecProps, WordProps);
+    m_bNotifyFlag = FALSE;
   }
 }
 
 void CFX_Edit::SetCaret(int32_t nPos) {
   if (m_pVT->IsValid()) {
     SelectNone();
     SetCaret(m_pVT->WordIndexToWordPlace(nPos));
     m_SelState.Set(m_wpCaret, m_wpCaret);
 
     ScrollToCaret();
@@ skipping 343 matching lines @@
 
 FX_BOOL CFX_Edit::Backspace(FX_BOOL bAddUndo, FX_BOOL bPaint) {
   if (m_pVT->IsValid()) {
     if (m_wpCaret == m_pVT->GetBeginWordPlace())
       return FALSE;
 
     CPVT_Section section;
     CPVT_Word word;
 
     if (bAddUndo) {
-      if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-        pIterator->SetAt(m_wpCaret);
-        pIterator->GetSection(section);
-        pIterator->GetWord(word);
-      }
+      CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+      pIterator->SetAt(m_wpCaret);
+      pIterator->GetSection(section);
+      pIterator->GetWord(word);
     }
 
     m_pVT->UpdateWordPlace(m_wpCaret);
     SetCaret(m_pVT->BackSpaceWord(m_wpCaret));
     m_SelState.Set(m_wpCaret, m_wpCaret);
 
     if (m_wpCaret != m_wpOldCaret) {
       if (bAddUndo && m_bEnableUndo) {
         if (m_wpCaret.SecCmp(m_wpOldCaret) != 0)
           AddEditUndoItem(new CFXEU_Backspace(
@@ skipping 38 matching lines @@
 
 FX_BOOL CFX_Edit::Delete(FX_BOOL bAddUndo, FX_BOOL bPaint) {
   if (m_pVT->IsValid()) {
     if (m_wpCaret == m_pVT->GetEndWordPlace())
       return FALSE;
 
     CPVT_Section section;
     CPVT_Word word;
 
     if (bAddUndo) {
-      if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-        pIterator->SetAt(m_pVT->GetNextWordPlace(m_wpCaret));
-        pIterator->GetSection(section);
-        pIterator->GetWord(word);
-      }
+      CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+      pIterator->SetAt(m_pVT->GetNextWordPlace(m_wpCaret));
+      pIterator->GetSection(section);
+      pIterator->GetWord(word);
     }
 
     m_pVT->UpdateWordPlace(m_wpCaret);
     FX_BOOL bSecEnd = (m_wpCaret == m_pVT->GetSectionEndPlace(m_wpCaret));
 
     SetCaret(m_pVT->DeleteWord(m_wpCaret));
     m_SelState.Set(m_wpCaret, m_wpCaret);
 
     if (bAddUndo && m_bEnableUndo) {
       if (bSecEnd)
@@ skipping 41 matching lines @@
     m_pVT->DeleteWords(GetWholeWordRange());
     SetCaret(m_pVT->GetBeginWordPlace());
 
     return TRUE;
   }
 
   return FALSE;
 }
 
 FX_BOOL CFX_Edit::Clear(FX_BOOL bAddUndo, FX_BOOL bPaint) {
-  if (m_pVT->IsValid()) {
-    if (m_SelState.IsExist()) {
-      CPVT_WordRange range = m_SelState.ConvertToWordRange();
+  if (!m_pVT->IsValid())
+    return FALSE;
 
-      if (bAddUndo && m_bEnableUndo) {
-        if (m_pVT->IsRichText()) {
-          BeginGroupUndo(L"");
+  if (!m_SelState.IsExist())
+    return FALSE;
 
-          if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-            pIterator->SetAt(range.EndPos);
+  CPVT_WordRange range = m_SelState.ConvertToWordRange();
 
-            CPVT_Word wordinfo;
-            CPVT_Section secinfo;
-            do {
-              CPVT_WordPlace place = pIterator->GetAt();
-              if (place.WordCmp(range.BeginPos) <= 0)
-                break;
+  if (bAddUndo && m_bEnableUndo) {
+    if (m_pVT->IsRichText()) {
+      BeginGroupUndo(L"");
 
-              CPVT_WordPlace oldplace = m_pVT->GetPrevWordPlace(place);
+      CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+      pIterator->SetAt(range.EndPos);
 
-              if (oldplace.SecCmp(place) != 0) {
-                if (pIterator->GetSection(secinfo)) {
-                  AddEditUndoItem(new CFXEU_ClearRich(
-                      this, oldplace, place, range, wordinfo.Word,
-                      wordinfo.nCharset, secinfo.SecProps, secinfo.WordProps));
-                }
-              } else {
-                if (pIterator->GetWord(wordinfo)) {
-                  oldplace = m_pVT->AdjustLineHeader(oldplace, TRUE);
-                  place = m_pVT->AdjustLineHeader(place, TRUE);
+      CPVT_Word wordinfo;
+      CPVT_Section secinfo;
+      do {
+        CPVT_WordPlace place = pIterator->GetAt();
+        if (place.WordCmp(range.BeginPos) <= 0)
+          break;
 
-                  AddEditUndoItem(new CFXEU_ClearRich(
-                      this, oldplace, place, range, wordinfo.Word,
-                      wordinfo.nCharset, secinfo.SecProps, wordinfo.WordProps));
-                }
-              }
-            } while (pIterator->PrevWord());
+        CPVT_WordPlace oldplace = m_pVT->GetPrevWordPlace(place);
+
+        if (oldplace.SecCmp(place) != 0) {
+          if (pIterator->GetSection(secinfo)) {
+            AddEditUndoItem(new CFXEU_ClearRich(
+                this, oldplace, place, range, wordinfo.Word, wordinfo.nCharset,
+                secinfo.SecProps, secinfo.WordProps));
           }
-          EndGroupUndo();
         } else {
-          AddEditUndoItem(new CFXEU_Clear(this, range, GetSelText()));
+          if (pIterator->GetWord(wordinfo)) {
+            oldplace = m_pVT->AdjustLineHeader(oldplace, TRUE);
+            place = m_pVT->AdjustLineHeader(place, TRUE);
+
+            AddEditUndoItem(new CFXEU_ClearRich(
+                this, oldplace, place, range, wordinfo.Word, wordinfo.nCharset,
+                secinfo.SecProps, wordinfo.WordProps));
+          }
         }
-      }
-
-      SelectNone();
-      SetCaret(m_pVT->DeleteWords(range));
-      m_SelState.Set(m_wpCaret, m_wpCaret);
-
-      if (bPaint) {
-        RearrangePart(range);
-        ScrollToCaret();
-
-        CPVT_WordRange wr(m_wpOldCaret, GetVisibleWordRange().EndPos);
-        Refresh(RP_ANALYSE, &wr);
-
-        SetCaretOrigin();
-        SetCaretInfo();
-      }
-
-      if (m_bOprNotify && m_pOprNotify)
-        m_pOprNotify->OnClear(m_wpCaret, m_wpOldCaret);
-
-      return TRUE;
+      } while (pIterator->PrevWord());
+      EndGroupUndo();
+    } else {
+      AddEditUndoItem(new CFXEU_Clear(this, range, GetSelText()));
     }
   }
 
-  return FALSE;
+  SelectNone();
+  SetCaret(m_pVT->DeleteWords(range));
+  m_SelState.Set(m_wpCaret, m_wpCaret);
+
+  if (bPaint) {
+    RearrangePart(range);
+    ScrollToCaret();
+
+    CPVT_WordRange wr(m_wpOldCaret, GetVisibleWordRange().EndPos);
+    Refresh(RP_ANALYSE, &wr);
+
+    SetCaretOrigin();
+    SetCaretInfo();
+  }
+
+  if (m_bOprNotify && m_pOprNotify)
+    m_pOprNotify->OnClear(m_wpCaret, m_wpOldCaret);
+
+  return TRUE;
 }
 
 FX_BOOL CFX_Edit::InsertText(const FX_WCHAR* text,
                              int32_t charset,
                              const CPVT_SecProps* pSecProps,
                              const CPVT_WordProps* pWordProps,
                              FX_BOOL bAddUndo,
                              FX_BOOL bPaint) {
   if (IsTextOverflow())
     return FALSE;
@@ skipping 53 matching lines @@
     if (m_Undo.CanUndo()) {
       m_Undo.Undo();
       return TRUE;
     }
   }
 
   return FALSE;
 }
 
 void CFX_Edit::SetCaretOrigin() {
-  if (m_pVT->IsValid()) {
-    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-      pIterator->SetAt(m_wpCaret);
-      CPVT_Word word;
-      CPVT_Line line;
-      if (pIterator->GetWord(word)) {
-        m_ptCaret.x = word.ptWord.x + word.fWidth;
-        m_ptCaret.y = word.ptWord.y;
-      } else if (pIterator->GetLine(line)) {
-        m_ptCaret.x = line.ptLine.x;
-        m_ptCaret.y = line.ptLine.y;
-      }
-    }
+  if (!m_pVT->IsValid())
+    return;
+
+  CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+  pIterator->SetAt(m_wpCaret);
+  CPVT_Word word;
+  CPVT_Line line;
+  if (pIterator->GetWord(word)) {
+    m_ptCaret.x = word.ptWord.x + word.fWidth;
+    m_ptCaret.y = word.ptWord.y;
+  } else if (pIterator->GetLine(line)) {
+    m_ptCaret.x = line.ptLine.x;
+    m_ptCaret.y = line.ptLine.y;
   }
 }
 
 int32_t CFX_Edit::WordPlaceToWordIndex(const CPVT_WordPlace& place) const {
   if (m_pVT->IsValid())
     return m_pVT->WordPlaceToWordIndex(place);
 
   return -1;
 }
 
@@ skipping 81 matching lines @@
 
 void CFX_Edit::EnableNotify(FX_BOOL bNotify) {
   m_bNotify = bNotify;
 }
 
 void CFX_Edit::EnableOprNotify(FX_BOOL bNotify) {
   m_bOprNotify = bNotify;
 }
 
 FX_FLOAT CFX_Edit::GetLineTop(const CPVT_WordPlace& place) const {
-  if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-    CPVT_WordPlace wpOld = pIterator->GetAt();
+  CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+  CPVT_WordPlace wpOld = pIterator->GetAt();
 
-    pIterator->SetAt(place);
-    CPVT_Line line;
-    pIterator->GetLine(line);
+  pIterator->SetAt(place);
+  CPVT_Line line;
+  pIterator->GetLine(line);
 
-    pIterator->SetAt(wpOld);
+  pIterator->SetAt(wpOld);
 
-    return line.ptLine.y + line.fLineAscent;
-  }
-
-  return 0.0f;
+  return line.ptLine.y + line.fLineAscent;
 }
 
 FX_FLOAT CFX_Edit::GetLineBottom(const CPVT_WordPlace& place) const {
-  if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
-    CPVT_WordPlace wpOld = pIterator->GetAt();
+  CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator();
+  CPVT_WordPlace wpOld = pIterator->GetAt();
 
-    pIterator->SetAt(place);
-    CPVT_Line line;
-    pIterator->GetLine(line);
+  pIterator->SetAt(place);
+  CPVT_Line line;
+  pIterator->GetLine(line);
 
-    pIterator->SetAt(wpOld);
+  pIterator->SetAt(wpOld);
 
-    return line.ptLine.y + line.fLineDescent;
-  }
-
-  return 0.0f;
+  return line.ptLine.y + line.fLineDescent;
 }
 
 CPVT_WordPlace CFX_Edit::DoInsertText(const CPVT_WordPlace& place,
                                       const FX_WCHAR* text,
                                       int32_t charset,
                                       const CPVT_SecProps* pSecProps,
                                       const CPVT_WordProps* pWordProps) {
   CPVT_WordPlace wp = place;
 
   if (m_pVT->IsValid()) {
@@ skipping 53 matching lines @@
     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);
 }