Remove unused CFWL_Edit flags.

xfa/fde/cfde_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 "xfa/fde/cfde_txtedtengine.h"
 
 #include <algorithm>
 
@@ skipping 187 matching lines @@
     return 0;
   }
   m_bBefore = bBefore;
   m_nCaret = nIndex;
   MovePage2Char(m_nCaret);
   GetCaretRect(m_rtCaret, m_nCaretPage, m_nCaret, m_bBefore);
   if (!m_bBefore) {
     m_nCaret++;
     m_bBefore = true;
   }
-  m_fCaretPosReserve = (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_DocVertical)
-                           ? m_rtCaret.top
-                           : m_rtCaret.left;
+  m_fCaretPosReserve = m_rtCaret.left;
   m_Param.pEventSink->OnCaretChanged();
   m_nAnchorPos = -1;
   return m_nCaret;
 }
 
 int32_t CFDE_TxtEdtEngine::MoveCaretPos(FDE_TXTEDTMOVECARET eMoveCaret,
                                         bool bShift,
                                         bool bCtrl) {
   if (IsLocked()) {
     return 0;
   }
   if (m_PagePtrArray.GetSize() <= m_nCaretPage) {
     return 0;
   }
   bool bSelChange = false;
   if (IsSelect()) {
     ClearSelection();
     bSelChange = true;
   }
   if (bShift) {
     if (m_nAnchorPos == -1) {
       m_nAnchorPos = m_nCaret;
     }
   } else {
     m_nAnchorPos = -1;
   }
-  bool bVertical = m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_DocVertical;
+
   switch (eMoveCaret) {
     case MC_Left: {
-      if (bVertical) {
-        CFX_PointF ptCaret;
-        if (MoveUp(ptCaret)) {
-          UpdateCaretIndex(ptCaret);
-        }
-      } else {
-        bool bBefore = true;
-        int32_t nIndex = MoveBackward(bBefore);
-        if (nIndex >= 0) {
-          UpdateCaretRect(nIndex, bBefore);
-        }
+      bool bBefore = true;
+      int32_t nIndex = MoveBackward(bBefore);
+      if (nIndex >= 0) {
+        UpdateCaretRect(nIndex, bBefore);
       }
-    } break;
+      break;
+    }
     case MC_Right: {
-      if (bVertical) {
-        CFX_PointF ptCaret;
-        if (MoveDown(ptCaret)) {
-          UpdateCaretIndex(ptCaret);
-        }
-      } else {
-        bool bBefore = true;
-        int32_t nIndex = MoveForward(bBefore);
-        if (nIndex >= 0) {
-          UpdateCaretRect(nIndex, bBefore);
-        }
+      bool bBefore = true;
+      int32_t nIndex = MoveForward(bBefore);
+      if (nIndex >= 0) {
+        UpdateCaretRect(nIndex, bBefore);
       }
-    } break;
+      break;
+    }
     case MC_Up: {
-      if (bVertical) {
-        bool bBefore = true;
-        int32_t nIndex = MoveBackward(bBefore);
-        if (nIndex >= 0) {
-          UpdateCaretRect(nIndex, bBefore);
-        }
-      } else {
-        CFX_PointF ptCaret;
-        if (MoveUp(ptCaret)) {
-          UpdateCaretIndex(ptCaret);
-        }
+      CFX_PointF ptCaret;
+      if (MoveUp(ptCaret)) {
+        UpdateCaretIndex(ptCaret);
       }
-    } break;
+      break;
+    }
     case MC_Down: {
-      if (bVertical) {
-        bool bBefore = true;
-        int32_t nIndex = MoveForward(bBefore);
-        if (nIndex >= 0) {
-          UpdateCaretRect(nIndex, bBefore);
-        }
-      } else {
-        CFX_PointF ptCaret;
-        if (MoveDown(ptCaret)) {
-          UpdateCaretIndex(ptCaret);
-        }
+      CFX_PointF ptCaret;
+      if (MoveDown(ptCaret)) {
+        UpdateCaretIndex(ptCaret);
       }
-    } break;
+      break;
+    }
     case MC_WordBackward:
       break;
     case MC_WordForward:
       break;
     case MC_LineStart:
       MoveLineStart();
       break;
     case MC_LineEnd:
       MoveLineEnd();
       break;
@@ skipping 101 matching lines @@
     }
   }
   if (m_Param.dwMode & FDE_TEXTEDITMODE_Validate) {
     CFX_WideString wsText = GetPreInsertText(m_nCaret, lpBuffer, nLength);
     if (!m_Param.pEventSink->OnValidate(wsText))
       return FDE_TXTEDT_MODIFY_RET_F_Invalidate;
   }
   if (IsSelect()) {
     DeleteSelect();
   }
-  if (!(m_Param.dwMode & FDE_TEXTEDITMODE_NoRedoUndo))
-    m_Param.pEventSink->OnAddDoRecord(
-        pdfium::MakeUnique<CFDE_TxtEdtDoRecord_Insert>(this, m_nCaret, lpBuffer,
-                                                       nLength));
+  m_Param.pEventSink->OnAddDoRecord(
+      pdfium::MakeUnique<CFDE_TxtEdtDoRecord_Insert>(this, m_nCaret, lpBuffer,
+                                                     nLength));
 
   m_ChangeInfo.wsPrevText = GetText(0, -1);
   Inner_Insert(m_nCaret, lpBuffer, nLength);
   m_ChangeInfo.nChangeType = FDE_TXTEDT_TEXTCHANGE_TYPE_Insert;
   m_ChangeInfo.wsInsert = CFX_WideString(lpBuffer, nLength);
   nStart = m_nCaret;
   nStart += nLength;
   FX_WCHAR wChar = m_pTxtBuf->GetCharByIndex(nStart - 1);
   bool bBefore = true;
   if (wChar != L'\n' && wChar != L'\r') {
@@ skipping 33 matching lines @@
         (m_pTxtBuf->GetCharByIndex(nStart) == L'\r') &&
         (m_pTxtBuf->GetCharByIndex(nStart + 1) == L'\n')) {
       nCount++;
     }
   }
   if (m_Param.dwMode & FDE_TEXTEDITMODE_Validate) {
     CFX_WideString wsText = GetPreDeleteText(nStart, nCount);
     if (!m_Param.pEventSink->OnValidate(wsText))
       return FDE_TXTEDT_MODIFY_RET_F_Invalidate;
   }
-  if (!(m_Param.dwMode & FDE_TEXTEDITMODE_NoRedoUndo)) {
-    CFX_WideString wsRange = m_pTxtBuf->GetRange(nStart, nCount);
-    m_Param.pEventSink->OnAddDoRecord(
-        pdfium::MakeUnique<CFDE_TxtEdtDoRecord_DeleteRange>(this, nStart,
-                                                            m_nCaret, wsRange));
-  }
+  CFX_WideString wsRange = m_pTxtBuf->GetRange(nStart, nCount);
+  m_Param.pEventSink->OnAddDoRecord(
+      pdfium::MakeUnique<CFDE_TxtEdtDoRecord_DeleteRange>(this, nStart,
+                                                          m_nCaret, wsRange));
+
   m_ChangeInfo.nChangeType = FDE_TXTEDT_TEXTCHANGE_TYPE_Delete;
   m_ChangeInfo.wsDelete = GetText(nStart, nCount);
   Inner_DeleteRange(nStart, nCount);
   SetCaretPos(nStart + ((!bBackspace && nStart > 0) ? -1 : 0),
               (bBackspace || nStart == 0));
   m_Param.pEventSink->OnTextChanged(m_ChangeInfo);
   return FDE_TXTEDT_MODIFY_RET_S_Normal;
 }
 
 int32_t CFDE_TxtEdtEngine::DeleteRange(int32_t nStart, int32_t nCount) {
@@ skipping 160 matching lines @@
   for (int i = 0; i < nCount; ++i)
     delete m_SelRangePtrArr[i];
   m_SelRangePtrArr.RemoveAll();
   if (nCount && m_Param.pEventSink)
     m_Param.pEventSink->OnSelChanged();
 }
 
 bool CFDE_TxtEdtEngine::Redo(const IFDE_TxtEdtDoRecord* pDoRecord) {
   if (IsLocked())
     return false;
-  if (m_Param.dwMode & FDE_TEXTEDITMODE_NoRedoUndo)
-    return false;
   return pDoRecord->Redo();
 }
 
 bool CFDE_TxtEdtEngine::Undo(const IFDE_TxtEdtDoRecord* pDoRecord) {
   if (IsLocked())
     return false;
-  if (m_Param.dwMode & FDE_TEXTEDITMODE_NoRedoUndo)
-    return false;
   return pDoRecord->Undo();
 }
 
 int32_t CFDE_TxtEdtEngine::StartLayout() {
   Lock();
   RemoveAllPages();
   m_nLayoutPos = 0;
   m_nLineCount = 0;
   return 0;
 }
@@ skipping 259 matching lines @@
 
 void CFDE_TxtEdtEngine::DeleteRange_DoRecord(int32_t nStart,
                                              int32_t nCount,
                                              bool bSel) {
   ASSERT(nStart >= 0);
   if (nCount == -1) {
     nCount = GetTextLength() - nStart;
   }
   ASSERT((nStart + nCount) <= m_pTxtBuf->GetTextLength());
 
-  if (!(m_Param.dwMode & FDE_TEXTEDITMODE_NoRedoUndo)) {
-    CFX_WideString wsRange = m_pTxtBuf->GetRange(nStart, nCount);
-    m_Param.pEventSink->OnAddDoRecord(
-        pdfium::MakeUnique<CFDE_TxtEdtDoRecord_DeleteRange>(
-            this, nStart, m_nCaret, wsRange, bSel));
-  }
+  CFX_WideString wsRange = m_pTxtBuf->GetRange(nStart, nCount);
+  m_Param.pEventSink->OnAddDoRecord(
+      pdfium::MakeUnique<CFDE_TxtEdtDoRecord_DeleteRange>(
+          this, nStart, m_nCaret, wsRange, bSel));
+
   m_ChangeInfo.nChangeType = FDE_TXTEDT_TEXTCHANGE_TYPE_Delete;
   m_ChangeInfo.wsDelete = GetText(nStart, nCount);
   Inner_DeleteRange(nStart, nCount);
 }
 
 void CFDE_TxtEdtEngine::ResetEngine() {
   RemoveAllPages();
   RemoveAllParags();
   ClearSelection();
   m_nCaret = 0;
@@ skipping 75 matching lines @@
   }
 }
 
 void CFDE_TxtEdtEngine::UpdateTxtBreak() {
   uint32_t dwStyle = m_pTextBreak->GetLayoutStyles();
   if (m_Param.dwMode & FDE_TEXTEDITMODE_MultiLines) {
     dwStyle &= ~FX_TXTLAYOUTSTYLE_SingleLine;
   } else {
     dwStyle |= FX_TXTLAYOUTSTYLE_SingleLine;
   }
-  if (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_DocVertical) {
-    dwStyle |= FX_TXTLAYOUTSTYLE_VerticalLayout;
-  } else {
-    dwStyle &= ~FX_TXTLAYOUTSTYLE_VerticalLayout;
-  }
-  if (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_LineReserve) {
-    dwStyle |= FX_TXTLAYOUTSTYLE_ReverseLine;
-  } else {
-    dwStyle &= ~FX_TXTLAYOUTSTYLE_ReverseLine;
-  }
-  if (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_RTL) {
-    dwStyle |= FX_TXTLAYOUTSTYLE_RTLReadingOrder;
-  } else {
-    dwStyle &= ~FX_TXTLAYOUTSTYLE_RTLReadingOrder;
-  }
+  dwStyle &= ~FX_TXTLAYOUTSTYLE_VerticalLayout;
+  dwStyle &= ~FX_TXTLAYOUTSTYLE_ReverseLine;
+  dwStyle &= ~FX_TXTLAYOUTSTYLE_RTLReadingOrder;
+
   if (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_CombText) {
     dwStyle |= FX_TXTLAYOUTSTYLE_CombText;
   } else {
     dwStyle &= ~FX_TXTLAYOUTSTYLE_CombText;
   }
-  if (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_CharVertial) {
-    dwStyle |= FX_TXTLAYOUTSTYLE_VerticalChars;
-  } else {
-    dwStyle &= ~FX_TXTLAYOUTSTYLE_VerticalChars;
-  }
-  if (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_ExpandTab) {
-    dwStyle |= FX_TXTLAYOUTSTYLE_ExpandTab;
-  } else {
-    dwStyle &= ~FX_TXTLAYOUTSTYLE_ExpandTab;
-  }
-  if (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_ArabicContext) {
-    dwStyle |= FX_TXTLAYOUTSTYLE_ArabicContext;
-  } else {
-    dwStyle &= ~FX_TXTLAYOUTSTYLE_ArabicContext;
-  }
-  if (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_ArabicShapes) {
-    dwStyle |= FX_TXTLAYOUTSTYLE_ArabicShapes;
-  } else {
-    dwStyle &= ~FX_TXTLAYOUTSTYLE_ArabicShapes;
-  }
+
+  dwStyle &= ~FX_TXTLAYOUTSTYLE_VerticalChars;
+  dwStyle &= ~FX_TXTLAYOUTSTYLE_ExpandTab;
+  dwStyle &= ~FX_TXTLAYOUTSTYLE_ArabicContext;
+  dwStyle &= ~FX_TXTLAYOUTSTYLE_ArabicShapes;
+
   m_pTextBreak->SetLayoutStyles(dwStyle);
   uint32_t dwAligment = 0;
   if (m_Param.dwAlignment & FDE_TEXTEDITALIGN_Justified) {
     dwAligment |= FX_TXTLINEALIGNMENT_Justified;
-  } else if (m_Param.dwAlignment & FDE_TEXTEDITALIGN_Distributed) {
-    dwAligment |= FX_TXTLINEALIGNMENT_Distributed;
   }
   if (m_Param.dwAlignment & FDE_TEXTEDITALIGN_Center) {
     dwAligment |= FX_TXTLINEALIGNMENT_Center;
   } else if (m_Param.dwAlignment & FDE_TEXTEDITALIGN_Right) {
     dwAligment |= FX_TXTLINEALIGNMENT_Right;
   }
   m_pTextBreak->SetAlignment(dwAligment);
-  if (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_DocVertical) {
-    if (m_Param.dwMode & FDE_TEXTEDITMODE_AutoLineWrap) {
-      m_pTextBreak->SetLineWidth(m_Param.fPlateHeight);
-    } else {
-      m_pTextBreak->SetLineWidth(kPageWidthMax);
-    }
+
+  if (m_Param.dwMode & FDE_TEXTEDITMODE_AutoLineWrap) {
+    m_pTextBreak->SetLineWidth(m_Param.fPlateWidth);
   } else {
-    if (m_Param.dwMode & FDE_TEXTEDITMODE_AutoLineWrap) {
-      m_pTextBreak->SetLineWidth(m_Param.fPlateWidth);
-    } else {
-      m_pTextBreak->SetLineWidth(kPageWidthMax);
-    }
+    m_pTextBreak->SetLineWidth(kPageWidthMax);
   }
+
   m_nPageLineCount = m_Param.nLineCount;
   if (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_CombText) {
-    FX_FLOAT fCombWidth =
-        m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_DocVertical
-            ? m_Param.fPlateHeight
-            : m_Param.fPlateWidth;
+    FX_FLOAT fCombWidth = m_Param.fPlateWidth;
     if (m_nLimit > 0) {
       fCombWidth /= m_nLimit;
     }
     m_pTextBreak->SetCombWidth(fCombWidth);
   }
   m_pTextBreak->SetFont(m_Param.pFont);
   m_pTextBreak->SetFontSize(m_Param.fFontSize);
   m_pTextBreak->SetTabWidth(m_Param.fTabWidth, m_Param.bTabEquidistant);
   m_pTextBreak->SetDefaultChar(m_Param.wDefChar);
   m_pTextBreak->SetParagraphBreakChar(m_Param.wLineBreakChar);
@@ skipping 185 matching lines @@
     nCaret--;
   }
   nCaret--;
   bBefore = true;
   return nCaret;
 }
 
 bool CFDE_TxtEdtEngine::MoveUp(CFX_PointF& ptCaret) {
   IFDE_TxtEdtPage* pPage = GetPage(m_nCaretPage);
   const CFX_RectF& rtContent = pPage->GetContentsBox();
-  if (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_DocVertical) {
-    ptCaret.x = m_rtCaret.left + m_rtCaret.width / 2 - m_Param.fLineSpace;
-    ptCaret.y = m_fCaretPosReserve;
-    bool bLineReserve =
-        !!(m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_LineReserve);
-    if (ptCaret.x < rtContent.left) {
-      if (bLineReserve) {
-        if (m_nCaretPage == CountPages() - 1) {
-          return false;
-        }
-      } else {
-        if (m_nCaretPage == 0) {
-          return false;
-        }
-      }
-      if (bLineReserve) {
-        m_nCaretPage++;
-      } else {
-        m_nCaretPage--;
-      }
-      ptCaret.x -= rtContent.left;
-      IFDE_TxtEdtPage* pCurPage = GetPage(m_nCaretPage);
-      ptCaret.x += pCurPage->GetContentsBox().right();
+  ptCaret.x = m_fCaretPosReserve;
+  ptCaret.y = m_rtCaret.top + m_rtCaret.height / 2 - m_Param.fLineSpace;
+  if (ptCaret.y < rtContent.top) {
+    if (m_nCaretPage == 0) {
+      return false;
     }
-  } else {
-    ptCaret.x = m_fCaretPosReserve;
-    ptCaret.y = m_rtCaret.top + m_rtCaret.height / 2 - m_Param.fLineSpace;
-    if (ptCaret.y < rtContent.top) {
-      if (m_nCaretPage == 0) {
-        return false;
-      }
-      ptCaret.y -= rtContent.top;
-      m_nCaretPage--;
-      IFDE_TxtEdtPage* pCurPage = GetPage(m_nCaretPage);
-      ptCaret.y += pCurPage->GetContentsBox().bottom();
-    }
+    ptCaret.y -= rtContent.top;
+    m_nCaretPage--;
+    IFDE_TxtEdtPage* pCurPage = GetPage(m_nCaretPage);
+    ptCaret.y += pCurPage->GetContentsBox().bottom();
   }
+
   return true;
 }
 
 bool CFDE_TxtEdtEngine::MoveDown(CFX_PointF& ptCaret) {
   IFDE_TxtEdtPage* pPage = GetPage(m_nCaretPage);
   const CFX_RectF& rtContent = pPage->GetContentsBox();
-  if (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_DocVertical) {
-    ptCaret.x = m_rtCaret.left + m_rtCaret.width / 2 + m_Param.fLineSpace;
-    ptCaret.y = m_fCaretPosReserve;
-    if (ptCaret.x >= rtContent.right()) {
-      bool bLineReserve =
-          !!(m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_LineReserve);
-      if (bLineReserve) {
-        if (m_nCaretPage == 0) {
-          return false;
-        }
-      } else {
-        if (m_nCaretPage == CountPages() - 1) {
-          return false;
-        }
-      }
-      if (bLineReserve) {
-        m_nCaretPage--;
-      } else {
-        m_nCaretPage++;
-      }
-      ptCaret.x -= rtContent.right();
-      IFDE_TxtEdtPage* pCurPage = GetPage(m_nCaretPage);
-      ptCaret.x += pCurPage->GetContentsBox().left;
+  ptCaret.x = m_fCaretPosReserve;
+  ptCaret.y = m_rtCaret.top + m_rtCaret.height / 2 + m_Param.fLineSpace;
+  if (ptCaret.y >= rtContent.bottom()) {
+    if (m_nCaretPage == CountPages() - 1) {
+      return false;
     }
-  } else {
-    ptCaret.x = m_fCaretPosReserve;
-    ptCaret.y = m_rtCaret.top + m_rtCaret.height / 2 + m_Param.fLineSpace;
-    if (ptCaret.y >= rtContent.bottom()) {
-      if (m_nCaretPage == CountPages() - 1) {
-        return false;
-      }
-      ptCaret.y -= rtContent.bottom();
-      m_nCaretPage++;
-      IFDE_TxtEdtPage* pCurPage = GetPage(m_nCaretPage);
-      ptCaret.y += pCurPage->GetContentsBox().top;
-    }
+    ptCaret.y -= rtContent.bottom();
+    m_nCaretPage++;
+    IFDE_TxtEdtPage* pCurPage = GetPage(m_nCaretPage);
+    ptCaret.y += pCurPage->GetContentsBox().top;
   }
   return true;
 }
 
 bool CFDE_TxtEdtEngine::MoveLineStart() {
   int32_t nIndex = m_bBefore ? m_nCaret : m_nCaret - 1;
   FDE_TXTEDTPARAGPOS ParagPos;
   TextPos2ParagPos(nIndex, ParagPos);
   CFDE_TxtEdtParag* pParag = m_ParagPtrArray[ParagPos.nParagIndex];
   pParag->LoadParag();
@@ skipping 120 matching lines @@
 
 void CFDE_TxtEdtEngine::UpdateCaretRect(int32_t nIndex, bool bBefore) {
   MovePage2Char(nIndex);
   GetCaretRect(m_rtCaret, m_nCaretPage, nIndex, bBefore);
   m_nCaret = nIndex;
   m_bBefore = bBefore;
   if (!m_bBefore) {
     m_nCaret++;
     m_bBefore = true;
   }
-  m_fCaretPosReserve = (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_DocVertical)
-                           ? m_rtCaret.top
-                           : m_rtCaret.left;
+  m_fCaretPosReserve = m_rtCaret.left;
   m_Param.pEventSink->OnCaretChanged();
 }
 
 void CFDE_TxtEdtEngine::GetCaretRect(CFX_RectF& rtCaret,
                                      int32_t nPageIndex,
                                      int32_t nCaret,
                                      bool bBefore) {
   IFDE_TxtEdtPage* pPage = m_PagePtrArray[m_nCaretPage];
   m_Param.pEventSink->OnPageLoad(m_nCaretPage);
   bool bCombText = !!(m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_CombText);
   int32_t nIndexInpage = nCaret - pPage->GetCharStart();
   if (bBefore && bCombText && nIndexInpage > 0) {
     nIndexInpage--;
     bBefore = false;
   }
   int32_t nBIDILevel = pPage->GetCharRect(nIndexInpage, rtCaret, bCombText);
-  if (m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_DocVertical) {
-    if ((!FX_IsOdd(nBIDILevel) && !bBefore) ||
-        (FX_IsOdd(nBIDILevel) && bBefore)) {
-      rtCaret.Offset(0, rtCaret.height - 1.0f);
-    }
-    if (rtCaret.height == 0 && rtCaret.top > 1.0f)
-      rtCaret.top -= 1.0f;
+  if ((!FX_IsOdd(nBIDILevel) && !bBefore) ||
+      (FX_IsOdd(nBIDILevel) && bBefore)) {
+    rtCaret.Offset(rtCaret.width - 1.0f, 0);
+  }
+  if (rtCaret.width == 0 && rtCaret.left > 1.0f)
+    rtCaret.left -= 1.0f;
 
-    rtCaret.height = 1.0f;
-  } else {
-    if ((!FX_IsOdd(nBIDILevel) && !bBefore) ||
-        (FX_IsOdd(nBIDILevel) && bBefore)) {
-      rtCaret.Offset(rtCaret.width - 1.0f, 0);
-    }
-    if (rtCaret.width == 0 && rtCaret.left > 1.0f)
-      rtCaret.left -= 1.0f;
+  rtCaret.width = 1.0f;
 
-    rtCaret.width = 1.0f;
-  }
   m_Param.pEventSink->OnPageUnload(m_nCaretPage);
 }
 
 void CFDE_TxtEdtEngine::UpdateCaretIndex(const CFX_PointF& ptCaret) {
   IFDE_TxtEdtPage* pPage = m_PagePtrArray[m_nCaretPage];
   m_Param.pEventSink->OnPageLoad(m_nCaretPage);
   m_nCaret = pPage->GetCharIndex(ptCaret, m_bBefore);
   GetCaretRect(m_rtCaret, m_nCaretPage, m_nCaret, m_bBefore);
   if (!m_bBefore) {
     m_nCaret++;
@@ skipping 17 matching lines @@
       m_SelRangePtrArr.RemoveAt(nCountRange);
       DeleteRange_DoRecord(nSelStart, nSelCount, true);
     }
     ClearSelection();
     m_Param.pEventSink->OnTextChanged(m_ChangeInfo);
     m_Param.pEventSink->OnSelChanged();
     SetCaretPos(nSelStart, true);
     return;
   }
 }