diff options
| author | Wei Li <weili@chromium.org> | 2016-04-11 10:02:09 -0700 |
|---|---|---|
| committer | Wei Li <weili@chromium.org> | 2016-04-11 10:02:09 -0700 |
| commit | e1aebd43b0c75133f94f8b141b33d12e2e715524 (patch) | |
| tree | 863aded8c706db162eb3f69d6482100f9d61b842 /core/fpdfdoc/doc_action.cpp | |
| parent | 2d4a4fc372159ac7562abea48498b6ab72c2f321 (diff) | |
| download | pdfium-e1aebd43b0c75133f94f8b141b33d12e2e715524.tar.xz | |
Use std::vector as internal storage for CPDF_Array
Replace the usage of CFX_ArrayTemplate inside CPDF_Array, which
has non-standard APIs such as GetSize() returns int.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1867183002 .
Diffstat (limited to 'core/fpdfdoc/doc_action.cpp')
| -rw-r--r-- | core/fpdfdoc/doc_action.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/fpdfdoc/doc_action.cpp b/core/fpdfdoc/doc_action.cpp index 3036d61ab0..c478bbe1f4 100644 --- a/core/fpdfdoc/doc_action.cpp +++ b/core/fpdfdoc/doc_action.cpp @@ -101,7 +101,7 @@ CFX_ByteString CPDF_Action::GetURI(CPDF_Document* pDoc) const { } return csURI; } -uint32_t CPDF_ActionFields::GetFieldsCount() const { +size_t CPDF_ActionFields::GetFieldsCount() const { if (!m_pAction) { return 0; } @@ -148,8 +148,7 @@ std::vector<CPDF_Object*> CPDF_ActionFields::GetAllFields() const { if (pFields->IsDictionary() || pFields->IsString()) { fields.push_back(pFields); } else if (CPDF_Array* pArray = pFields->AsArray()) { - uint32_t iCount = pArray->GetCount(); - for (uint32_t i = 0; i < iCount; ++i) { + for (size_t i = 0; i < pArray->GetCount(); ++i) { CPDF_Object* pObj = pArray->GetDirectObjectAt(i); if (pObj) { fields.push_back(pObj); @@ -159,7 +158,7 @@ std::vector<CPDF_Object*> CPDF_ActionFields::GetAllFields() const { return fields; } -CPDF_Object* CPDF_ActionFields::GetField(uint32_t iIndex) const { +CPDF_Object* CPDF_ActionFields::GetField(size_t iIndex) const { if (!m_pAction) { return NULL; } @@ -233,7 +232,7 @@ int32_t CPDF_Action::GetOperationType() const { } return 0; } -uint32_t CPDF_Action::GetSubActionsCount() const { +size_t CPDF_Action::GetSubActionsCount() const { if (!m_pDict || !m_pDict->KeyExist("Next")) return 0; @@ -246,7 +245,7 @@ uint32_t CPDF_Action::GetSubActionsCount() const { return pArray->GetCount(); return 0; } -CPDF_Action CPDF_Action::GetSubAction(uint32_t iIndex) const { +CPDF_Action CPDF_Action::GetSubAction(size_t iIndex) const { if (!m_pDict || !m_pDict->KeyExist("Next")) { return CPDF_Action(); } |