summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/cxfa_valuearray.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-03-14 12:13:22 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-03-14 19:59:49 +0000
commitf8a943908a414836271a1b7d7e4a97635d941b7f (patch)
tree7f900d57e21c72a67a0347e4f25d0784bdad7c83 /xfa/fxfa/parser/cxfa_valuearray.cpp
parent05df075154a832fcb476e1dfcfb865722d0ea898 (diff)
downloadpdfium-f8a943908a414836271a1b7d7e4a97635d941b7f.tar.xz
Replace CXFA_{Object,Node}Array with std::vector
These two ought to happen at the same time as they are intertwined in spots. Remove blatant casts between the two along the way. Change-Id: I9ce5d2faadf1e38aba7cade316560d24a66d8669 Reviewed-on: https://pdfium-review.googlesource.com/2933 Commit-Queue: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_valuearray.cpp')
-rw-r--r--xfa/fxfa/parser/cxfa_valuearray.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/cxfa_valuearray.cpp b/xfa/fxfa/parser/cxfa_valuearray.cpp
index 04afc40b0e..1170010139 100644
--- a/xfa/fxfa/parser/cxfa_valuearray.cpp
+++ b/xfa/fxfa/parser/cxfa_valuearray.cpp
@@ -16,7 +16,10 @@ CXFA_ValueArray::~CXFA_ValueArray() {
delete GetAt(i);
}
-void CXFA_ValueArray::GetAttributeObject(CXFA_ObjArray& objArray) {
+std::vector<CXFA_Object*> CXFA_ValueArray::GetAttributeObject() {
+ std::vector<CXFA_Object*> objArray;
for (int32_t i = 0; i < GetSize(); i++)
- objArray.Add(CXFA_ScriptContext::ToObject(GetAt(i), nullptr));
+ objArray.push_back(CXFA_ScriptContext::ToObject(GetAt(i), nullptr));
+
+ return objArray;
}