diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-14 18:34:00 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-14 18:34:00 -0800 |
| commit | 412e908082a361d0fd9591eab939e96a882212f1 (patch) | |
| tree | 11726052ae08f13dc5a05a82cbce870758580aeb /core/src/fpdftext/fpdf_text_search.cpp | |
| parent | 96660d6f382204339d6b1aadc3913303d436e252 (diff) | |
| download | pdfium-412e908082a361d0fd9591eab939e96a882212f1.tar.xz | |
Merge to XFA: Get rid of most instance of 'foo == NULL'
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1520063002 .
(cherry picked from commit e385244f8cd6ae376f6b3cf1265a0795d5d30eff)
Review URL: https://codereview.chromium.org/1528763003 .
Diffstat (limited to 'core/src/fpdftext/fpdf_text_search.cpp')
| -rw-r--r-- | core/src/fpdftext/fpdf_text_search.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/core/src/fpdftext/fpdf_text_search.cpp b/core/src/fpdftext/fpdf_text_search.cpp index 43486c7ab8..80bf5ec99a 100644 --- a/core/src/fpdftext/fpdf_text_search.cpp +++ b/core/src/fpdftext/fpdf_text_search.cpp @@ -303,13 +303,8 @@ void GetTextStream_Unicode(CFX_WideTextBuf& buffer, FX_POSITION pos = pPage->GetFirstObjectPosition(); while (pos) { CPDF_PageObject* pObject = pPage->GetNextObject(pos); - if (pObject == NULL) { - continue; - } - if (pObject->m_Type != PDFPAGE_TEXT) { - continue; - } - textstream.ProcessObject((CPDF_TextObject*)pObject, FALSE); + if (pObject && pObject->m_Type == PDFPAGE_TEXT) + textstream.ProcessObject((CPDF_TextObject*)pObject, FALSE); } } CFX_WideString PDF_GetFirstTextLine_Unicode(CPDF_Document* pDoc, |