Index: fpdfsdk/src/fxedit/fxet_edit.cpp |
diff --git a/fpdfsdk/src/fxedit/fxet_edit.cpp b/fpdfsdk/src/fxedit/fxet_edit.cpp |
index 8e109b5cf80a280403948f52e5acd3b287ff99af..6c4e3678a4caadd9a016350eb2f72603548514cd 100644 |
--- a/fpdfsdk/src/fxedit/fxet_edit.cpp |
+++ b/fpdfsdk/src/fxedit/fxet_edit.cpp |
@@ -23,106 +23,82 @@ CFX_Edit_Iterator::~CFX_Edit_Iterator() |
FX_BOOL CFX_Edit_Iterator::NextWord() |
{ |
- ASSERT(m_pVTIterator != NULL); |
- |
return m_pVTIterator->NextWord(); |
} |
FX_BOOL CFX_Edit_Iterator::NextLine() |
{ |
- ASSERT(m_pVTIterator != NULL); |
- |
return m_pVTIterator->NextLine(); |
} |
FX_BOOL CFX_Edit_Iterator::NextSection() |
{ |
- ASSERT(m_pVTIterator != NULL); |
- |
return m_pVTIterator->NextSection(); |
} |
FX_BOOL CFX_Edit_Iterator::PrevWord() |
{ |
- ASSERT(m_pVTIterator != NULL); |
- |
return m_pVTIterator->PrevWord(); |
} |
FX_BOOL CFX_Edit_Iterator::PrevLine() |
{ |
- ASSERT(m_pVTIterator != NULL); |
- |
return m_pVTIterator->PrevLine(); |
} |
FX_BOOL CFX_Edit_Iterator::PrevSection() |
{ |
- ASSERT(m_pVTIterator != NULL); |
- |
return m_pVTIterator->PrevSection(); |
} |
FX_BOOL CFX_Edit_Iterator::GetWord(CPVT_Word & word) const |
{ |
- ASSERT(m_pEdit != NULL); |
- ASSERT(m_pVTIterator != NULL); |
+ ASSERT(m_pEdit); |
if (m_pVTIterator->GetWord(word)) |
{ |
word.ptWord = m_pEdit->VTToEdit(word.ptWord); |
return TRUE; |
} |
- |
return FALSE; |
} |
FX_BOOL CFX_Edit_Iterator::GetLine(CPVT_Line & line) const |
{ |
- ASSERT(m_pEdit != NULL); |
- ASSERT(m_pVTIterator != NULL); |
+ ASSERT(m_pEdit); |
if (m_pVTIterator->GetLine(line)) |
{ |
line.ptLine = m_pEdit->VTToEdit(line.ptLine); |
return TRUE; |
} |
- |
return FALSE; |
} |
FX_BOOL CFX_Edit_Iterator::GetSection(CPVT_Section & section) const |
{ |
- ASSERT(m_pEdit != NULL); |
- ASSERT(m_pVTIterator != NULL); |
+ ASSERT(m_pEdit); |
if (m_pVTIterator->GetSection(section)) |
{ |
section.rcSection = m_pEdit->VTToEdit(section.rcSection); |
return TRUE; |
} |
- |
return FALSE; |
} |
void CFX_Edit_Iterator::SetAt(int32_t nWordIndex) |
{ |
- ASSERT(m_pVTIterator != NULL); |
- |
m_pVTIterator->SetAt(nWordIndex); |
} |
void CFX_Edit_Iterator::SetAt(const CPVT_WordPlace & place) |
{ |
- ASSERT(m_pVTIterator != NULL); |
- |
m_pVTIterator->SetAt(place); |
} |
const CPVT_WordPlace & CFX_Edit_Iterator::GetAt() const |
{ |
- ASSERT(m_pVTIterator != NULL); |
- |
return m_pVTIterator->GetAt(); |
} |
@@ -435,10 +411,7 @@ void CFX_Edit_Undo::AddItem(IFX_Edit_UndoItem* pItem) |
FX_BOOL CFX_Edit_Undo::IsModified() const |
{ |
- if (m_bVirgin) |
- return m_bModified; |
- else |
- return TRUE; |
+ return m_bVirgin ? m_bModified : TRUE; |
} |
IFX_Edit_UndoItem* CFX_Edit_Undo::GetItem(int32_t nIndex) |