diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-01-26 13:20:26 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-01-26 13:20:26 -0800 |
| commit | 8e5cd19d174f259bfda5f7a9699b08fdc4289b56 (patch) | |
| tree | 6c2382c4cfe0475ecbfafc1af981dcaa0a801c35 /core/src/fpdftext/fpdf_text_int.cpp | |
| parent | d834d55f902ccd18cba85f93ecf51e30c5e7e47b (diff) | |
| download | pdfium-8e5cd19d174f259bfda5f7a9699b08fdc4289b56.tar.xz | |
Merge to XFA: War on #defines, part 1.
Contains additional XFA-specific changes.
Original Review URL: https://codereview.chromium.org/1632143002 .
(cherry picked from commit 66a9dc9dd65ed2b9c7ede448d046b770140f16d5)
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1636503006 .
Diffstat (limited to 'core/src/fpdftext/fpdf_text_int.cpp')
| -rw-r--r-- | core/src/fpdftext/fpdf_text_int.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index ae26cbd252..55f736ee9c 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -771,7 +771,7 @@ int32_t CPDF_TextPage::FindTextlineFlowDirection() { if (NULL == pPageObj) { continue; } - if (PDFPAGE_TEXT != pPageObj->m_Type) { + if (CPDF_PageObject::TEXT != pPageObj->m_Type) { continue; } int32_t minH = @@ -860,11 +860,11 @@ void CPDF_TextPage::ProcessObject() { while (pos) { pPageObj = m_pPage->GetNextObject(pos); if (pPageObj) { - if (pPageObj->m_Type == PDFPAGE_TEXT) { + if (pPageObj->m_Type == CPDF_PageObject::TEXT) { CFX_Matrix matrix; ProcessTextObject((CPDF_TextObject*)pPageObj, matrix, pos); nCount++; - } else if (pPageObj->m_Type == PDFPAGE_FORM) { + } else if (pPageObj->m_Type == CPDF_PageObject::FORM) { CFX_Matrix formMatrix(1, 0, 0, 1, 0, 0); ProcessFormObject((CPDF_FormObject*)pPageObj, formMatrix); } @@ -895,9 +895,9 @@ void CPDF_TextPage::ProcessFormObject(CPDF_FormObject* pFormObj, while (pos) { pPageObj = pFormObj->m_pForm->GetNextObject(pos); if (pPageObj) { - if (pPageObj->m_Type == PDFPAGE_TEXT) { + if (pPageObj->m_Type == CPDF_PageObject::TEXT) { ProcessTextObject((CPDF_TextObject*)pPageObj, curFormMatrix, pos); - } else if (pPageObj->m_Type == PDFPAGE_FORM) { + } else if (pPageObj->m_Type == CPDF_PageObject::FORM) { ProcessFormObject((CPDF_FormObject*)pPageObj, curFormMatrix); } } @@ -1967,7 +1967,7 @@ FX_BOOL CPDF_TextPage::IsSameAsPreTextObject(CPDF_TextObject* pTextObj, if (pObj == pTextObj) { continue; } - if (pObj->m_Type != PDFPAGE_TEXT) { + if (pObj->m_Type != CPDF_PageObject::TEXT) { continue; } if (IsSameTextObject((CPDF_TextObject*)pObj, pTextObj)) { |