Index: xfa/fee/fde_txtedtengine.cpp |
diff --git a/xfa/fee/fde_txtedtengine.cpp b/xfa/fee/fde_txtedtengine.cpp |
index 98d7841b40d1ae0802ce669cb9b4aba867f73497..28f15c6ae12744cf46ff508f16c980df060b0904 100644 |
--- a/xfa/fee/fde_txtedtengine.cpp |
+++ b/xfa/fee/fde_txtedtengine.cpp |
@@ -9,11 +9,10 @@ |
#include <algorithm> |
#include "xfa/fde/tto/fde_textout.h" |
-#include "xfa/fee/fde_txtedtbuf.h" |
#include "xfa/fee/fde_txtedtparag.h" |
-#include "xfa/fee/ifde_txtedtbuf.h" |
#include "xfa/fee/ifde_txtedtengine.h" |
#include "xfa/fee/ifde_txtedtpage.h" |
+#include "xfa/fwl/basewidget/fwl_editimp.h" |
#define FDE_PAGEWIDTH_MAX 0xFFFF |
#define FDE_TXTPLATESIZE (1024 * 12) |
@@ -21,9 +20,6 @@ |
#define FDE_TXTEDT_DORECORD_INS 0 |
#define FDE_TXTEDT_DORECORD_DEL 1 |
-IFDE_TxtEdtEngine* IFDE_TxtEdtEngine::Create() { |
- return new CFDE_TxtEdtEngine(); |
-} |
CFDE_TxtEdtEngine::CFDE_TxtEdtEngine() |
: m_pTextBreak(nullptr), |
m_nPageLineCount(20), |
@@ -71,7 +67,7 @@ void CFDE_TxtEdtEngine::SetEditParams(const FDE_TXTEDTPARAMS& params) { |
m_bAutoLineEnd = (m_Param.nLineEnd == FDE_TXTEDIT_LINEEND_Auto); |
UpdateTxtBreak(); |
} |
-const FDE_TXTEDTPARAMS* CFDE_TxtEdtEngine::GetEditParams() const { |
+FDE_TXTEDTPARAMS* CFDE_TxtEdtEngine::GetEditParams() { |
return &m_Param; |
} |
int32_t CFDE_TxtEdtEngine::CountPages() const { |
@@ -329,7 +325,7 @@ int32_t CFDE_TxtEdtEngine::Insert(int32_t nStart, |
int32_t nTotalLength = GetTextBufLength(); |
int32_t nCount = m_SelRangePtrArr.GetSize(); |
for (int32_t i = 0; i < nCount; i++) { |
- FDE_LPTXTEDTSELRANGE lpSelRange = m_SelRangePtrArr.GetAt(i); |
+ FDE_TXTEDTSELRANGE* lpSelRange = m_SelRangePtrArr.GetAt(i); |
nTotalLength -= lpSelRange->nCount; |
} |
int32_t nExpectLength = nTotalLength + nLength; |
@@ -538,7 +534,7 @@ void CFDE_TxtEdtEngine::SetAliasChar(FX_WCHAR wcAlias) { |
} |
void CFDE_TxtEdtEngine::RemoveSelRange(int32_t nStart, int32_t nCount) { |
- FDE_LPTXTEDTSELRANGE lpTemp = NULL; |
+ FDE_TXTEDTSELRANGE* lpTemp = nullptr; |
int32_t nRangeCount = m_SelRangePtrArr.GetSize(); |
int32_t i = 0; |
for (i = 0; i < nRangeCount; i++) { |
@@ -557,17 +553,17 @@ void CFDE_TxtEdtEngine::AddSelRange(int32_t nStart, int32_t nCount) { |
} |
int32_t nSize = m_SelRangePtrArr.GetSize(); |
if (nSize <= 0) { |
- FDE_LPTXTEDTSELRANGE lpSelRange = new FDE_TXTEDTSELRANGE; |
+ FDE_TXTEDTSELRANGE* lpSelRange = new FDE_TXTEDTSELRANGE; |
lpSelRange->nStart = nStart; |
lpSelRange->nCount = nCount; |
m_SelRangePtrArr.Add(lpSelRange); |
m_Param.pEventSink->On_SelChanged(this); |
return; |
} |
- FDE_LPTXTEDTSELRANGE lpTemp = NULL; |
+ FDE_TXTEDTSELRANGE* lpTemp = nullptr; |
lpTemp = m_SelRangePtrArr[nSize - 1]; |
if (nStart >= lpTemp->nStart + lpTemp->nCount) { |
- FDE_LPTXTEDTSELRANGE lpSelRange = new FDE_TXTEDTSELRANGE; |
+ FDE_TXTEDTSELRANGE* lpSelRange = new FDE_TXTEDTSELRANGE; |
lpSelRange->nStart = nStart; |
lpSelRange->nCount = nCount; |
m_SelRangePtrArr.Add(lpSelRange); |
@@ -602,7 +598,7 @@ void CFDE_TxtEdtEngine::AddSelRange(int32_t nStart, int32_t nCount) { |
} |
} |
if (nRangeCnt == 0) { |
- FDE_LPTXTEDTSELRANGE lpSelRange = new FDE_TXTEDTSELRANGE; |
+ FDE_TXTEDTSELRANGE* lpSelRange = new FDE_TXTEDTSELRANGE; |
lpSelRange->nStart = nStart; |
lpSelRange->nCount = nCount; |
m_SelRangePtrArr.InsertAt(nRangeBgn, lpSelRange); |
@@ -629,13 +625,13 @@ int32_t CFDE_TxtEdtEngine::GetSelRange(int32_t nIndex, int32_t& nStart) { |
} |
void CFDE_TxtEdtEngine::ClearSelection() { |
int32_t nCount = m_SelRangePtrArr.GetSize(); |
- FDE_LPTXTEDTSELRANGE lpRange = NULL; |
+ FDE_TXTEDTSELRANGE* lpRange = nullptr; |
int32_t i = 0; |
for (i = 0; i < nCount; i++) { |
lpRange = m_SelRangePtrArr[i]; |
- if (lpRange != NULL) { |
+ if (lpRange) { |
delete lpRange; |
- lpRange = NULL; |
+ lpRange = nullptr; |
} |
} |
m_SelRangePtrArr.RemoveAll(); |
@@ -715,8 +711,8 @@ void CFDE_TxtEdtEngine::EndLayout() { |
FX_BOOL CFDE_TxtEdtEngine::Optimize(IFX_Pause* pPause) { |
return m_pTxtBuf->Optimize(pPause); |
} |
-IFDE_TxtEdtBuf* CFDE_TxtEdtEngine::GetTextBuf() const { |
- return (IFDE_TxtEdtBuf*)m_pTxtBuf; |
+CFDE_TxtEdtBuf* CFDE_TxtEdtEngine::GetTextBuf() const { |
+ return m_pTxtBuf; |
} |
int32_t CFDE_TxtEdtEngine::GetTextBufLength() const { |
return m_pTxtBuf->GetTextLength() - 1; |
@@ -733,7 +729,7 @@ int32_t CFDE_TxtEdtEngine::GetPageLineCount() const { |
int32_t CFDE_TxtEdtEngine::CountParags() const { |
return m_ParagPtrArray.GetSize(); |
} |
-IFDE_TxtEdtParag* CFDE_TxtEdtEngine::GetParag(int32_t nParagIndex) const { |
+CFDE_TxtEdtParag* CFDE_TxtEdtEngine::GetParag(int32_t nParagIndex) const { |
return m_ParagPtrArray[nParagIndex]; |
} |
IFX_CharIter* CFDE_TxtEdtEngine::CreateCharIter() { |
@@ -1038,7 +1034,6 @@ void CFDE_TxtEdtEngine::UpdatePages() { |
} |
m_PagePtrArray.RemoveAt(i); |
} |
- m_Param.pEventSink->On_PageCountChanged(this); |
return; |
} |
if (nSize < nPageCount) { |
@@ -1048,7 +1043,6 @@ void CFDE_TxtEdtEngine::UpdatePages() { |
pPage = IFDE_TxtEdtPage::Create(this, i); |
m_PagePtrArray.Add(pPage); |
} |
- m_Param.pEventSink->On_PageCountChanged(this); |
return; |
} |
} |
@@ -1272,7 +1266,6 @@ int32_t CFDE_TxtEdtEngine::MovePage2Char(int32_t nIndex) { |
ASSERT(i < pParag->m_nLineCount); |
nLineCount += (i + 1); |
m_nCaretPage = (nLineCount - 1) / m_nPageLineCount + 1 - 1; |
- m_Param.pEventSink->On_PageChange(this, m_nCaretPage); |
pParag->UnloadParag(); |
return m_nCaretPage; |
} |
@@ -1353,7 +1346,6 @@ FX_BOOL CFDE_TxtEdtEngine::MoveUp(CFX_PointF& ptCaret) { |
} else { |
m_nCaretPage--; |
} |
- m_Param.pEventSink->On_PageChange(this, m_nCaretPage); |
ptCaret.x -= rtContent.left; |
IFDE_TxtEdtPage* pCurPage = GetPage(m_nCaretPage); |
ptCaret.x += pCurPage->GetContentsBox().right(); |
@@ -1367,7 +1359,6 @@ FX_BOOL CFDE_TxtEdtEngine::MoveUp(CFX_PointF& ptCaret) { |
} |
ptCaret.y -= rtContent.top; |
m_nCaretPage--; |
- m_Param.pEventSink->On_PageChange(this, m_nCaretPage); |
IFDE_TxtEdtPage* pCurPage = GetPage(m_nCaretPage); |
ptCaret.y += pCurPage->GetContentsBox().bottom(); |
} |
@@ -1397,7 +1388,6 @@ FX_BOOL CFDE_TxtEdtEngine::MoveDown(CFX_PointF& ptCaret) { |
} else { |
m_nCaretPage++; |
} |
- m_Param.pEventSink->On_PageChange(this, m_nCaretPage); |
ptCaret.x -= rtContent.right(); |
IFDE_TxtEdtPage* pCurPage = GetPage(m_nCaretPage); |
ptCaret.x += pCurPage->GetContentsBox().left; |
@@ -1411,7 +1401,6 @@ FX_BOOL CFDE_TxtEdtEngine::MoveDown(CFX_PointF& ptCaret) { |
} |
ptCaret.y -= rtContent.bottom(); |
m_nCaretPage++; |
- m_Param.pEventSink->On_PageChange(this, m_nCaretPage); |
IFDE_TxtEdtPage* pCurPage = GetPage(m_nCaretPage); |
ptCaret.y += pCurPage->GetContentsBox().top; |
} |
@@ -1610,7 +1599,7 @@ void CFDE_TxtEdtEngine::DeleteSelect() { |
int32_t nSelCount; |
while (nCountRange > 0) { |
nSelCount = GetSelRange(--nCountRange, nSelStart); |
- FDE_LPTXTEDTSELRANGE lpTemp = m_SelRangePtrArr[nCountRange]; |
+ FDE_TXTEDTSELRANGE* lpTemp = m_SelRangePtrArr[nCountRange]; |
delete lpTemp; |
m_SelRangePtrArr.RemoveAt(nCountRange); |
DeleteRange_DoRecord(nSelStart, nSelCount, TRUE); |