Merge to XFA: War on #defines, part 1.

core/src/fpdftext/fpdf_text_int.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/src/fpdftext/text_int.h"
 
 #include <algorithm>
 #include <cctype>
@@ skipping 753 matching lines @@
   FX_POSITION pos = NULL;
   pos = m_pPage->GetFirstObjectPosition();
   if (!pos) {
     return -1;
   }
   while (pos) {
     pPageObj = m_pPage->GetNextObject(pos);
     if (NULL == pPageObj) {
       continue;
     }
-    if (PDFPAGE_TEXT != pPageObj->m_Type) {
+    if (CPDF_PageObject::TEXT != pPageObj->m_Type) {
       continue;
     }
     int32_t minH =
         (int32_t)pPageObj->m_Left < 0 ? 0 : (int32_t)pPageObj->m_Left;
     int32_t maxH = (int32_t)pPageObj->m_Right > nPageWidth
                        ? nPageWidth
                        : (int32_t)pPageObj->m_Right;
     int32_t minV =
         (int32_t)pPageObj->m_Bottom < 0 ? 0 : (int32_t)pPageObj->m_Bottom;
     int32_t maxV = (int32_t)pPageObj->m_Top > nPageHeight
@@ skipping 68 matching lines @@
   FX_POSITION pos;
   pos = m_pPage->GetFirstObjectPosition();
   if (!pos) {
     return;
   }
   m_TextlineDir = FindTextlineFlowDirection();
   int nCount = 0;
   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);
       }
     }
     pPageObj = NULL;
   }
   int count = m_LineObj.GetSize();
   for (int i = 0; i < count; i++) {
     ProcessTextObject(m_LineObj.GetAt(i));
   }
@@ skipping 10 matching lines @@
   pos = pFormObj->m_pForm->GetFirstObjectPosition();
   if (!pos) {
     return;
   }
   CFX_Matrix curFormMatrix;
   curFormMatrix.Copy(pFormObj->m_FormMatrix);
   curFormMatrix.Concat(formMatrix);
   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);
       }
     }
     pPageObj = NULL;
   }
 }
 int CPDF_TextPage::GetCharWidth(FX_DWORD charCode, CPDF_Font* pFont) const {
   if (charCode == -1) {
     return 0;
   }
@@ skipping 1049 matching lines @@
   int i = 0;
   if (!ObjPos) {
     ObjPos = m_pPage->GetLastObjectPosition();
   }
   CPDF_PageObject* pObj = m_pPage->GetPrevObject(ObjPos);
   while (i < 5 && ObjPos) {
     pObj = m_pPage->GetPrevObject(ObjPos);
     if (pObj == pTextObj) {
       continue;
     }
-    if (pObj->m_Type != PDFPAGE_TEXT) {
+    if (pObj->m_Type != CPDF_PageObject::TEXT) {
       continue;
     }
     if (IsSameTextObject((CPDF_TextObject*)pObj, pTextObj)) {
       return TRUE;
     }
     i++;
   }
   return FALSE;
 }
 
@@ skipping 653 matching lines @@
   if (!m_bIsParsed || index < 0 || index >= m_LinkList.GetSize()) {
     return;
   }
   CPDF_LinkExt* link = NULL;
   link = m_LinkList.GetAt(index);
   if (!link) {
     return;
   }
   m_pTextPage->GetRectArray(link->m_Start, link->m_Count, rects);
 }