summaryrefslogtreecommitdiff
path: root/core/src/fpdfdoc/pdf_vt.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-16 14:13:14 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-16 14:13:14 -0700
commit357d16f8453c2cf0c0afd00eec9e86d03d55fe69 (patch)
tree7a8fe29a921ae4a9dfc6063fd126c6c62181686f /core/src/fpdfdoc/pdf_vt.h
parent269aaa26f33891f42934fa4f3e4ca3e320018a21 (diff)
downloadpdfium-357d16f8453c2cf0c0afd00eec9e86d03d55fe69.tar.xz
Replace FX_NEW with new, remove tests in fpdfdoc.
R=thestig@chromium.org Review URL: https://codereview.chromium.org/1090693002
Diffstat (limited to 'core/src/fpdfdoc/pdf_vt.h')
-rw-r--r--core/src/fpdfdoc/pdf_vt.h23
1 files changed, 9 insertions, 14 deletions
diff --git a/core/src/fpdfdoc/pdf_vt.h b/core/src/fpdfdoc/pdf_vt.h
index f910dfd372..19c75479ea 100644
--- a/core/src/fpdfdoc/pdf_vt.h
+++ b/core/src/fpdfdoc/pdf_vt.h
@@ -106,14 +106,14 @@ struct CPVT_SectionInfo {
if (pSecProps) {
*pSecProps = *other.pSecProps;
} else {
- pSecProps = FX_NEW CPVT_SecProps(*other.pSecProps);
+ pSecProps = new CPVT_SecProps(*other.pSecProps);
}
}
if (other.pWordProps) {
if (pWordProps) {
*pWordProps = *other.pWordProps;
} else {
- pWordProps = FX_NEW CPVT_WordProps(*other.pWordProps);
+ pWordProps = new CPVT_WordProps(*other.pWordProps);
}
}
}
@@ -169,7 +169,7 @@ struct CPVT_WordInfo {
if (pWordProps) {
*pWordProps = *word.pWordProps;
} else {
- pWordProps = FX_NEW CPVT_WordProps(*word.pWordProps);
+ pWordProps = new CPVT_WordProps(*word.pWordProps);
}
}
}
@@ -258,18 +258,13 @@ public:
FX_INT32 Add(const CPVT_LineInfo & lineinfo)
{
if (m_nTotal >= GetSize()) {
- if (CLine * pLine = FX_NEW CLine) {
- pLine->m_LineInfo = lineinfo;
- m_Lines.Add(pLine);
- return m_nTotal++;
- }
- return m_nTotal;
- } else {
- if (CLine * pLine = GetAt(m_nTotal)) {
- pLine->m_LineInfo = lineinfo;
- }
- return m_nTotal++;
+ CLine* pLine = new CLine;
+ pLine->m_LineInfo = lineinfo;
+ m_Lines.Add(pLine);
+ } else if (CLine* pLine = GetAt(m_nTotal)) {
+ pLine->m_LineInfo = lineinfo;
}
+ return m_nTotal++;
}
void Clear()
{