summaryrefslogtreecommitdiff
path: root/fpdfsdk/include/fxedit
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-08-13 15:40:18 -0700
committerLei Zhang <thestig@chromium.org>2015-08-13 15:40:18 -0700
commite00660b5fa41956db06c557807b68a1117d1b70b (patch)
treee3c0bd280a2ee1d3a978d55db259724327281e21 /fpdfsdk/include/fxedit
parent0434f5b8ec8de0e89714f301826e9e3bbf617fbf (diff)
downloadpdfium-e00660b5fa41956db06c557807b68a1117d1b70b.tar.xz
Merge to XFA: Remove if checks after new.
R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1287863002 . (cherry picked from commit 388a3b0b8d6f75d47978c08299300f121f04884c) Review URL: https://codereview.chromium.org/1292653002 .
Diffstat (limited to 'fpdfsdk/include/fxedit')
-rw-r--r--fpdfsdk/include/fxedit/fxet_edit.h19
1 files changed, 9 insertions, 10 deletions
diff --git a/fpdfsdk/include/fxedit/fxet_edit.h b/fpdfsdk/include/fxedit/fxet_edit.h
index d654ebc451..2cb7c99720 100644
--- a/fpdfsdk/include/fxedit/fxet_edit.h
+++ b/fpdfsdk/include/fxedit/fxet_edit.h
@@ -115,8 +115,7 @@ class CFX_Edit_LineRectArray {
}
void Add(const CPVT_WordRange& wrLine, const CPDF_Rect& rcLine) {
- if (CFX_Edit_LineRect* pRect = new CFX_Edit_LineRect(wrLine, rcLine))
- m_LineRects.Add(pRect);
+ m_LineRects.Add(new CFX_Edit_LineRect(wrLine, rcLine));
}
int32_t GetSize() const { return m_LineRects.GetSize(); }
@@ -145,14 +144,14 @@ class CFX_Edit_RectArray {
}
void Add(const CPDF_Rect& rect) {
- // check for overlaped area
- for (int32_t i = 0, sz = m_Rects.GetSize(); i < sz; i++)
- if (CPDF_Rect* pRect = m_Rects.GetAt(i))
- if (pRect->Contains(rect))
- return;
-
- if (CPDF_Rect* pNewRect = new CPDF_Rect(rect))
- m_Rects.Add(pNewRect);
+ // check for overlapped area
+ for (int32_t i = 0, sz = m_Rects.GetSize(); i < sz; i++) {
+ CPDF_Rect* pRect = m_Rects.GetAt(i);
+ if (pRect && pRect->Contains(rect))
+ return;
+ }
+
+ m_Rects.Add(new CPDF_Rect(rect));
}
int32_t GetSize() const { return m_Rects.GetSize(); }