diff options
Diffstat (limited to 'xfa/fee')
-rw-r--r-- | xfa/fee/fde_txtedtbuf.cpp | 38 | ||||
-rw-r--r-- | xfa/fee/fde_txtedtengine.cpp | 38 | ||||
-rw-r--r-- | xfa/fee/fde_txtedtpage.cpp | 8 | ||||
-rw-r--r-- | xfa/fee/fde_txtedtparag.cpp | 8 | ||||
-rw-r--r-- | xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp | 8 |
5 files changed, 50 insertions, 50 deletions
diff --git a/xfa/fee/fde_txtedtbuf.cpp b/xfa/fee/fde_txtedtbuf.cpp index 6f638dde09..9029806d3b 100644 --- a/xfa/fee/fde_txtedtbuf.cpp +++ b/xfa/fee/fde_txtedtbuf.cpp @@ -22,7 +22,7 @@ CFDE_TxtEdtBufIter::CFDE_TxtEdtBufIter(CFDE_TxtEdtBuf* pBuf, FX_WCHAR wcAlias) m_nCurIndex(0), m_nIndex(0), m_Alias(wcAlias) { - FXSYS_assert(m_pBuf); + ASSERT(m_pBuf); } CFDE_TxtEdtBufIter::~CFDE_TxtEdtBufIter() {} void CFDE_TxtEdtBufIter::Release() { @@ -33,7 +33,7 @@ FX_BOOL CFDE_TxtEdtBufIter::Next(FX_BOOL bPrev) { if (m_nIndex == 0) { return FALSE; } - FXSYS_assert(m_nCurChunk < m_pBuf->m_Chunks.GetSize()); + ASSERT(m_nCurChunk < m_pBuf->m_Chunks.GetSize()); CFDE_TxtEdtBuf::FDE_LPCHUNKHEADER lpChunk = NULL; if (m_nCurIndex > 0) { m_nCurIndex--; @@ -48,14 +48,14 @@ FX_BOOL CFDE_TxtEdtBufIter::Next(FX_BOOL bPrev) { } } } - FXSYS_assert(m_nCurChunk >= 0); + ASSERT(m_nCurChunk >= 0); m_nIndex--; return TRUE; } else { if (m_nIndex >= (m_pBuf->m_nTotal - 1)) { return FALSE; } - FXSYS_assert(m_nCurChunk < m_pBuf->m_Chunks.GetSize()); + ASSERT(m_nCurChunk < m_pBuf->m_Chunks.GetSize()); CFDE_TxtEdtBuf::FDE_LPCHUNKHEADER lpChunk = (CFDE_TxtEdtBuf::FDE_LPCHUNKHEADER)m_pBuf->m_Chunks[m_nCurChunk]; if (lpChunk->nUsed != (m_nCurIndex + 1)) { @@ -77,7 +77,7 @@ FX_BOOL CFDE_TxtEdtBufIter::Next(FX_BOOL bPrev) { } } void CFDE_TxtEdtBufIter::SetAt(int32_t nIndex) { - FXSYS_assert(nIndex >= 0 && nIndex < m_pBuf->m_nTotal); + ASSERT(nIndex >= 0 && nIndex < m_pBuf->m_nTotal); CFDE_TxtEdtBuf::FDE_CHUNKPLACE cp; m_pBuf->Index2CP(nIndex, cp); m_nIndex = nIndex; @@ -88,7 +88,7 @@ int32_t CFDE_TxtEdtBufIter::GetAt() const { return m_nIndex; } FX_WCHAR CFDE_TxtEdtBufIter::GetChar() { - FXSYS_assert(m_nIndex >= 0 && m_nIndex < m_pBuf->m_nTotal); + ASSERT(m_nIndex >= 0 && m_nIndex < m_pBuf->m_nTotal); if (m_Alias == 0 || m_nIndex == (m_pBuf->m_nTotal - 1)) { return ((CFDE_TxtEdtBuf::FDE_LPCHUNKHEADER)m_pBuf->m_Chunks[m_nCurChunk]) ->wChars[m_nCurIndex]; @@ -111,7 +111,7 @@ CFDE_TxtEdtBuf::CFDE_TxtEdtBuf(int32_t nDefChunkSize) m_nTotal(0), m_bChanged(FALSE), m_pAllocator(NULL) { - FXSYS_assert(m_nChunkSize); + ASSERT(m_nChunkSize); ResetChunkBuffer(FDE_DEFCHUNKCOUNT, m_nChunkSize); } void CFDE_TxtEdtBuf::Release() { @@ -123,7 +123,7 @@ CFDE_TxtEdtBuf::~CFDE_TxtEdtBuf() { m_Chunks.RemoveAll(); } FX_BOOL CFDE_TxtEdtBuf::SetChunkSize(int32_t nChunkSize) { - FXSYS_assert(nChunkSize); + ASSERT(nChunkSize); ResetChunkBuffer(FDE_DEFCHUNKCOUNT, nChunkSize); return TRUE; } @@ -134,7 +134,7 @@ int32_t CFDE_TxtEdtBuf::GetTextLength() const { return m_nTotal; } void CFDE_TxtEdtBuf::SetText(const CFX_WideString& wsText) { - FXSYS_assert(!wsText.IsEmpty()); + ASSERT(!wsText.IsEmpty()); Clear(FALSE); int32_t nTextLength = wsText.GetLength(); int32_t nNeedCount = @@ -167,7 +167,7 @@ void CFDE_TxtEdtBuf::GetText(CFX_WideString& wsText) const { GetRange(wsText, 0, m_nTotal); } FX_WCHAR CFDE_TxtEdtBuf::GetCharByIndex(int32_t nIndex) const { - FXSYS_assert(nIndex >= 0 && nIndex < GetTextLength()); + ASSERT(nIndex >= 0 && nIndex < GetTextLength()); FDE_LPCHUNKHEADER pChunkHeader = NULL; int32_t nTotal = 0; int32_t nCount = m_Chunks.GetSize(); @@ -179,7 +179,7 @@ FX_WCHAR CFDE_TxtEdtBuf::GetCharByIndex(int32_t nIndex) const { break; } } - FXSYS_assert(pChunkHeader); + ASSERT(pChunkHeader); return pChunkHeader->wChars[pChunkHeader->nUsed - (nTotal - nIndex)]; } void CFDE_TxtEdtBuf::GetRange(CFX_WideString& wsText, @@ -214,7 +214,7 @@ void CFDE_TxtEdtBuf::GetRange(CFX_WideString& wsText, void CFDE_TxtEdtBuf::Insert(int32_t nPos, const FX_WCHAR* lpText, int32_t nLength) { - FXSYS_assert(nPos >= 0 && nPos <= m_nTotal); + ASSERT(nPos >= 0 && nPos <= m_nTotal); FDE_CHUNKPLACE cp; Index2CP(nPos, cp); int32_t nLengthTemp = nLength; @@ -248,7 +248,7 @@ void CFDE_TxtEdtBuf::Insert(int32_t nPos, while (nLengthTemp > 0) { FDE_LPCHUNKHEADER lpChunk = (FDE_LPCHUNKHEADER)m_pAllocator->Alloc( sizeof(FDE_CHUNKHEADER) + (m_nChunkSize - 1) * sizeof(FX_WCHAR)); - FXSYS_assert(lpChunk); + ASSERT(lpChunk); int32_t nCopy = std::min(nLengthTemp, m_nChunkSize); FXSYS_memcpy(lpChunk->wChars, lpText, nCopy * sizeof(FX_WCHAR)); lpText += nCopy; @@ -261,7 +261,7 @@ void CFDE_TxtEdtBuf::Insert(int32_t nPos, m_bChanged = TRUE; } void CFDE_TxtEdtBuf::Delete(int32_t nIndex, int32_t nLength) { - FXSYS_assert(nLength > 0 && nIndex >= 0 && nIndex + nLength <= m_nTotal); + ASSERT(nLength > 0 && nIndex >= 0 && nIndex + nLength <= m_nTotal); FDE_CHUNKPLACE cpEnd; Index2CP(nIndex + nLength - 1, cpEnd); m_nTotal -= nLength; @@ -354,8 +354,8 @@ FX_BOOL CFDE_TxtEdtBuf::Optimize(IFX_Pause* pPause) { } void CFDE_TxtEdtBuf::ResetChunkBuffer(int32_t nDefChunkCount, int32_t nChunkSize) { - FXSYS_assert(nChunkSize); - FXSYS_assert(nDefChunkCount); + ASSERT(nChunkSize); + ASSERT(nDefChunkCount); if (m_pAllocator) { m_pAllocator->Release(); m_pAllocator = NULL; @@ -366,10 +366,10 @@ void CFDE_TxtEdtBuf::ResetChunkBuffer(int32_t nDefChunkCount, sizeof(FDE_CHUNKHEADER) + (m_nChunkSize - 1) * sizeof(FX_WCHAR); m_pAllocator = FX_CreateAllocator(FX_ALLOCTYPE_Fixed, nDefChunkCount, nChunkLength); - FXSYS_assert(m_pAllocator); + ASSERT(m_pAllocator); FDE_LPCHUNKHEADER lpChunkHeader = (FDE_LPCHUNKHEADER)m_pAllocator->Alloc(nChunkLength); - FXSYS_assert(lpChunkHeader); + ASSERT(lpChunkHeader); lpChunkHeader->nUsed = 0; m_Chunks.Add(lpChunkHeader); m_nTotal = 0; @@ -383,7 +383,7 @@ int32_t CFDE_TxtEdtBuf::CP2Index(const FDE_CHUNKPLACE& cp) const { return nTotal; } void CFDE_TxtEdtBuf::Index2CP(int32_t nIndex, FDE_CHUNKPLACE& cp) const { - FXSYS_assert(nIndex <= GetTextLength()); + ASSERT(nIndex <= GetTextLength()); if (nIndex == m_nTotal) { cp.nChunkIndex = m_Chunks.GetSize() - 1; cp.nCharIndex = ((FDE_LPCHUNKHEADER)m_Chunks[cp.nChunkIndex])->nUsed; diff --git a/xfa/fee/fde_txtedtengine.cpp b/xfa/fee/fde_txtedtengine.cpp index adb28ea081..98d7841b40 100644 --- a/xfa/fee/fde_txtedtengine.cpp +++ b/xfa/fee/fde_txtedtengine.cpp @@ -167,7 +167,7 @@ int32_t CFDE_TxtEdtEngine::SetCaretPos(int32_t nIndex, FX_BOOL bBefore) { if (IsLocked()) { return 0; } - FXSYS_assert(nIndex >= 0 && nIndex <= GetTextBufLength()); + ASSERT(nIndex >= 0 && nIndex <= GetTextBufLength()); if (m_PagePtrArray.GetSize() <= m_nCaretPage) { return 0; } @@ -651,7 +651,7 @@ FX_BOOL CFDE_TxtEdtEngine::Redo(const CFX_ByteStringC& bsRedo) { return FALSE; } IFDE_TxtEdtDoRecord* pDoRecord = IFDE_TxtEdtDoRecord::Create(bsRedo); - FXSYS_assert(pDoRecord); + ASSERT(pDoRecord); if (pDoRecord == NULL) { return FALSE; } @@ -667,7 +667,7 @@ FX_BOOL CFDE_TxtEdtEngine::Undo(const CFX_ByteStringC& bsUndo) { return FALSE; } IFDE_TxtEdtDoRecord* pDoRecord = IFDE_TxtEdtDoRecord::Create(bsUndo); - FXSYS_assert(pDoRecord); + ASSERT(pDoRecord); if (pDoRecord == NULL) { return FALSE; } @@ -812,7 +812,7 @@ void CFDE_TxtEdtEngine::GetPreReplaceText(CFX_WideString& wsText, void CFDE_TxtEdtEngine::Inner_Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLength) { - FXSYS_assert(nLength > 0); + ASSERT(nLength > 0); FDE_TXTEDTPARAGPOS ParagPos; TextPos2ParagPos(nStart, ParagPos); m_Param.pEventSink->On_PageUnload(this, m_nCaretPage, 0); @@ -878,7 +878,7 @@ void CFDE_TxtEdtEngine::Inner_DeleteRange(int32_t nStart, int32_t nCount) { nCount = m_pTxtBuf->GetTextLength() - nStart; } int32_t nEnd = nStart + nCount - 1; - FXSYS_assert(nStart >= 0 && nEnd < m_pTxtBuf->GetTextLength()); + ASSERT(nStart >= 0 && nEnd < m_pTxtBuf->GetTextLength()); m_Param.pEventSink->On_PageUnload(this, m_nCaretPage, 0); FDE_TXTEDTPARAGPOS ParagPosBgn, ParagPosEnd; TextPos2ParagPos(nStart, ParagPosBgn); @@ -931,11 +931,11 @@ void CFDE_TxtEdtEngine::Inner_DeleteRange(int32_t nStart, int32_t nCount) { void CFDE_TxtEdtEngine::DeleteRange_DoRecord(int32_t nStart, int32_t nCount, FX_BOOL bSel) { - FXSYS_assert(nStart >= 0); + ASSERT(nStart >= 0); if (nCount == -1) { nCount = GetTextLength() - nStart; } - FXSYS_assert((nStart + nCount) <= m_pTxtBuf->GetTextLength()); + ASSERT((nStart + nCount) <= m_pTxtBuf->GetTextLength()); if (!(m_Param.dwMode & FDE_TEXTEDITMODE_NoRedoUndo)) { CFX_WideString wsRange; @@ -1235,8 +1235,8 @@ void CFDE_TxtEdtEngine::RecoverParagEnd(CFX_WideString& wsText) { } } int32_t CFDE_TxtEdtEngine::MovePage2Char(int32_t nIndex) { - FXSYS_assert(nIndex >= 0); - FXSYS_assert(nIndex <= m_pTxtBuf->GetTextLength()); + ASSERT(nIndex >= 0); + ASSERT(nIndex <= m_pTxtBuf->GetTextLength()); if (m_nCaretPage >= 0) { IFDE_TxtEdtPage* pPage = m_PagePtrArray[m_nCaretPage]; m_Param.pEventSink->On_PageLoad(this, m_nCaretPage, 0); @@ -1269,7 +1269,7 @@ int32_t CFDE_TxtEdtEngine::MovePage2Char(int32_t nIndex) { break; } } - FXSYS_assert(i < pParag->m_nLineCount); + ASSERT(i < pParag->m_nLineCount); nLineCount += (i + 1); m_nCaretPage = (nLineCount - 1) / m_nPageLineCount + 1 - 1; m_Param.pEventSink->On_PageChange(this, m_nCaretPage); @@ -1278,7 +1278,7 @@ int32_t CFDE_TxtEdtEngine::MovePage2Char(int32_t nIndex) { } void CFDE_TxtEdtEngine::TextPos2ParagPos(int32_t nIndex, FDE_TXTEDTPARAGPOS& ParagPos) const { - FXSYS_assert(nIndex >= 0 && nIndex < m_pTxtBuf->GetTextLength()); + ASSERT(nIndex >= 0 && nIndex < m_pTxtBuf->GetTextLength()); int32_t nCount = m_ParagPtrArray.GetSize(); int32_t nBgn = 0; int32_t nMid = 0; @@ -1297,9 +1297,9 @@ void CFDE_TxtEdtEngine::TextPos2ParagPos(int32_t nIndex, if (nBgn == nEnd) { nMid = nBgn; } - FXSYS_assert(nIndex >= m_ParagPtrArray[nMid]->m_nCharStart && - (nIndex < m_ParagPtrArray[nMid]->m_nCharStart + - m_ParagPtrArray[nMid]->m_nCharCount)); + ASSERT(nIndex >= m_ParagPtrArray[nMid]->m_nCharStart && + (nIndex < m_ParagPtrArray[nMid]->m_nCharStart + + m_ParagPtrArray[nMid]->m_nCharCount)); ParagPos.nParagIndex = nMid; ParagPos.nCharIndex = nIndex - m_ParagPtrArray[nMid]->m_nCharStart; } @@ -1455,7 +1455,7 @@ FX_BOOL CFDE_TxtEdtEngine::MoveLineEnd() { } } nIndex = nStart + nCount - 1; - FXSYS_assert(nIndex <= GetTextBufLength()); + ASSERT(nIndex <= GetTextBufLength()); FX_WCHAR wChar = m_pTxtBuf->GetCharByIndex(nIndex); FX_BOOL bBefore = FALSE; if (nIndex <= GetTextBufLength()) { @@ -1646,7 +1646,7 @@ CFDE_TxtEdtDoRecord_Insert::CFDE_TxtEdtDoRecord_Insert( const FX_WCHAR* lpText, int32_t nLength) : m_pEngine(pEngine), m_nCaret(nCaret) { - FXSYS_assert(pEngine); + ASSERT(pEngine); FX_WCHAR* lpBuffer = m_wsInsert.GetBuffer(nLength); FXSYS_memcpy(lpBuffer, lpText, nLength * sizeof(FX_WCHAR)); m_wsInsert.ReleaseBuffer(); @@ -1695,7 +1695,7 @@ void CFDE_TxtEdtDoRecord_Insert::Deserialize( bsDoRecord.GetLength()); int32_t nType = 0; ArchiveLoader >> nType; - FXSYS_assert(nType == FDE_TXTEDT_DORECORD_INS); + ASSERT(nType == FDE_TXTEDT_DORECORD_INS); int32_t nEngine = 0; ArchiveLoader >> nEngine; m_pEngine = (CFDE_TxtEdtEngine*)(uintptr_t)nEngine; @@ -1717,7 +1717,7 @@ CFDE_TxtEdtDoRecord_DeleteRange::CFDE_TxtEdtDoRecord_DeleteRange( m_nIndex(nIndex), m_nCaret(nCaret), m_wsRange(wsRange) { - FXSYS_assert(pEngine); + ASSERT(pEngine); } CFDE_TxtEdtDoRecord_DeleteRange::~CFDE_TxtEdtDoRecord_DeleteRange() {} void CFDE_TxtEdtDoRecord_DeleteRange::Release() { @@ -1772,7 +1772,7 @@ void CFDE_TxtEdtDoRecord_DeleteRange::Deserialize( bsDoRecord.GetLength()); int32_t nType = 0; ArchiveLoader >> nType; - FXSYS_assert(nType == FDE_TXTEDT_DORECORD_DEL); + ASSERT(nType == FDE_TXTEDT_DORECORD_DEL); int32_t nEngine = 0; ArchiveLoader >> nEngine; m_pEngine = (CFDE_TxtEdtEngine*)(uintptr_t)nEngine; diff --git a/xfa/fee/fde_txtedtpage.cpp b/xfa/fee/fde_txtedtpage.cpp index 4aadb397da..5faafebd55 100644 --- a/xfa/fee/fde_txtedtpage.cpp +++ b/xfa/fee/fde_txtedtpage.cpp @@ -179,8 +179,8 @@ FX_BOOL CFDE_TxtEdtPage::GetClip(FDE_HVISUALOBJ hVisualObj, CFX_RectF& rt) { int32_t CFDE_TxtEdtPage::GetCharRect(int32_t nIndex, CFX_RectF& rect, FX_BOOL bBBox) const { - FXSYS_assert(m_nRefCount > 0); - FXSYS_assert(nIndex >= 0 && nIndex < m_nCharCount); + ASSERT(m_nRefCount > 0); + ASSERT(nIndex >= 0 && nIndex < m_nCharCount); if (m_nRefCount < 1) { return 0; } @@ -199,7 +199,7 @@ int32_t CFDE_TxtEdtPage::GetCharRect(int32_t nIndex, return pPiece->nBidiLevel; } } - FXSYS_assert(0); + ASSERT(0); return 0; } int32_t CFDE_TxtEdtPage::GetCharIndex(const CFX_PointF& fPoint, @@ -556,7 +556,7 @@ int32_t CFDE_TxtEdtPage::LoadPage(const CFX_RectF* pClipBox, return 0; } void CFDE_TxtEdtPage::UnloadPage(const CFX_RectF* pClipBox) { - FXSYS_assert(m_nRefCount > 0); + ASSERT(m_nRefCount > 0); m_nRefCount--; if (m_nRefCount == 0) { m_PieceMassArr.RemoveAll(); diff --git a/xfa/fee/fde_txtedtparag.cpp b/xfa/fee/fde_txtedtparag.cpp index 00899a140f..0aae327b16 100644 --- a/xfa/fee/fde_txtedtparag.cpp +++ b/xfa/fee/fde_txtedtparag.cpp @@ -19,7 +19,7 @@ CFDE_TxtEdtParag::CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine) m_nLineCount(0), m_lpData(NULL), m_pEngine(pEngine) { - FXSYS_assert(m_pEngine); + ASSERT(m_pEngine); } CFDE_TxtEdtParag::~CFDE_TxtEdtParag() { if (m_lpData != NULL) { @@ -92,9 +92,9 @@ void CFDE_TxtEdtParag::LoadParag() { LineBaseArr.RemoveAll(); } void CFDE_TxtEdtParag::UnloadParag() { - FXSYS_assert(m_lpData != NULL); + ASSERT(m_lpData != NULL); ((int32_t*)m_lpData)[0]--; - FXSYS_assert(((int32_t*)m_lpData)[0] >= 0); + ASSERT(((int32_t*)m_lpData)[0] >= 0); if (((int32_t*)m_lpData)[0] == 0) { FX_Free(m_lpData); m_lpData = NULL; @@ -139,7 +139,7 @@ void CFDE_TxtEdtParag::GetLineRange(int32_t nLineIndex, int32_t& nStart, int32_t& nCount) const { int32_t* pLineBaseArr = (int32_t*)m_lpData; - FXSYS_assert(nLineIndex < m_nLineCount); + ASSERT(nLineIndex < m_nLineCount); nStart = m_nCharStart; pLineBaseArr++; for (int32_t i = 0; i < nLineIndex; i++) { diff --git a/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp b/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp index e77c5f14bf..408558a9ca 100644 --- a/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp +++ b/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp @@ -14,7 +14,7 @@ FX_WordBreakProp FX_GetWordBreakProperty(FX_WCHAR wcCodePoint) { } CFX_CharIter::CFX_CharIter(const CFX_WideString& wsText) : m_wsText(wsText), m_nIndex(0) { - FXSYS_assert(!wsText.IsEmpty()); + ASSERT(!wsText.IsEmpty()); } CFX_CharIter::~CFX_CharIter() {} void CFX_CharIter::Release() { @@ -69,7 +69,7 @@ void CFX_WordBreak::Release() { delete this; } void CFX_WordBreak::Attach(IFX_CharIter* pIter) { - FXSYS_assert(pIter); + ASSERT(pIter); m_pCurIter = pIter; } void CFX_WordBreak::Attach(const CFX_WideString& wsText) { @@ -183,7 +183,7 @@ FX_BOOL CFX_WordBreak::FindNextBreakPos(IFX_CharIter* pIter, } } if (nFlags > 0) { - FXSYS_assert(nFlags <= 2); + ASSERT(nFlags <= 2); if (!((nFlags == 1 && ePreType == FX_WordBreakProp_ALetter) || (nFlags == 2 && ePreType == FX_WordBreakProp_Numberic))) { pIter->Next(!bPrev); @@ -215,7 +215,7 @@ FX_BOOL CFX_WordBreak::FindNextBreakPos(IFX_CharIter* pIter, pIter->Next(!bPrev); return TRUE; } - FXSYS_assert(nFlags <= 2); + ASSERT(nFlags <= 2); pIter->Next(bPrev); wcTemp = pIter->GetChar(); eNextType = (FX_WordBreakProp)FX_GetWordBreakProperty(wcTemp); |