Rename CPDFSDK_Annot::GetType to CPDFSDK_Annot::GetAnnotSubtype.

fpdfsdk/cba_annotiterator.cpp

 // Copyright 2016 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 "fpdfsdk/include/cba_annotiterator.h"
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
 #include "fpdfsdk/include/cpdfsdk_annot.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 
 // static
 bool CBA_AnnotIterator::CompareByLeftAscending(const CPDFSDK_Annot* p1,
                                                const CPDFSDK_Annot* p2) {
   return GetAnnotRect(p1).left < GetAnnotRect(p2).left;
 }
 
 // static
 bool CBA_AnnotIterator::CompareByTopDescending(const CPDFSDK_Annot* p1,
                                                const CPDFSDK_Annot* p2) {
   return GetAnnotRect(p1).top > GetAnnotRect(p2).top;
 }
 
 CBA_AnnotIterator::CBA_AnnotIterator(CPDFSDK_PageView* pPageView,
-                                     const CFX_ByteString& sType,
-                                     const CFX_ByteString& sSubType)
+                                     const CFX_ByteString& sAnnotSubtype)
     : m_eTabOrder(STRUCTURE),
       m_pPageView(pPageView),
-      m_sType(sType),
-      m_sSubType(sSubType) {
+      m_sAnnotSubtype(sAnnotSubtype) {
   CPDF_Page* pPDFPage = m_pPageView->GetPDFPage();
   CFX_ByteString sTabs = pPDFPage->m_pFormDict->GetStringBy("Tabs");
   if (sTabs == "R")
     m_eTabOrder = ROW;
   else if (sTabs == "C")
     m_eTabOrder = COLUMN;
 
   GenerateResults();
 }
 
@@ skipping 24 matching lines @@
   if (iter == m_Annots.begin())
     iter = m_Annots.end();
   return *(--iter);
 }
 
 void CBA_AnnotIterator::GenerateResults() {
   switch (m_eTabOrder) {
     case STRUCTURE: {
       for (size_t i = 0; i < m_pPageView->CountAnnots(); ++i) {
         CPDFSDK_Annot* pAnnot = m_pPageView->GetAnnot(i);
-        if (pAnnot->GetType() == m_sType && pAnnot->GetSubType() == m_sSubType)
+        if (pAnnot->GetAnnotSubtype() == m_sAnnotSubtype &&
+            !pAnnot->IsSignatureWidget())
           m_Annots.push_back(pAnnot);
       }
       break;
     }
     case ROW: {
       std::vector<CPDFSDK_Annot*> sa;
       for (size_t i = 0; i < m_pPageView->CountAnnots(); ++i) {
         CPDFSDK_Annot* pAnnot = m_pPageView->GetAnnot(i);
-        if (pAnnot->GetType() == m_sType && pAnnot->GetSubType() == m_sSubType)
+        if (pAnnot->GetAnnotSubtype() == m_sAnnotSubtype &&
+            !pAnnot->IsSignatureWidget())
           sa.push_back(pAnnot);
       }
 
       std::sort(sa.begin(), sa.end(), CompareByLeftAscending);
       while (!sa.empty()) {
         int nLeftTopIndex = -1;
         FX_FLOAT fTop = 0.0f;
         for (int i = sa.size() - 1; i >= 0; i--) {
           CFX_FloatRect rcAnnot = GetAnnotRect(sa[i]);
           if (rcAnnot.top > fTop) {
@@ skipping 20 matching lines @@
           for (int i = aSelect.size() - 1; i >= 0; --i)
             sa.erase(sa.begin() + aSelect[i]);
         }
       }
       break;
     }
     case COLUMN: {
       std::vector<CPDFSDK_Annot*> sa;
       for (size_t i = 0; i < m_pPageView->CountAnnots(); ++i) {
         CPDFSDK_Annot* pAnnot = m_pPageView->GetAnnot(i);
-        if (pAnnot->GetType() == m_sType && pAnnot->GetSubType() == m_sSubType)
+        if (pAnnot->GetAnnotSubtype() == m_sAnnotSubtype &&
+            !pAnnot->IsSignatureWidget())
           sa.push_back(pAnnot);
       }
 
       std::sort(sa.begin(), sa.end(), CompareByTopDescending);
       while (!sa.empty()) {
         int nLeftTopIndex = -1;
         FX_FLOAT fLeft = -1.0f;
         for (int i = sa.size() - 1; i >= 0; --i) {
           CFX_FloatRect rcAnnot = GetAnnotRect(sa[i]);
           if (fLeft < 0) {
@@ skipping 26 matching lines @@
         }
       }
       break;
     }
   }
 }
 
 CFX_FloatRect CBA_AnnotIterator::GetAnnotRect(const CPDFSDK_Annot* pAnnot) {
   return pAnnot->GetPDFAnnot()->GetRect();
 }