diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-03-14 12:13:22 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-14 19:59:49 +0000 |
| commit | f8a943908a414836271a1b7d7e4a97635d941b7f (patch) | |
| tree | 7f900d57e21c72a67a0347e4f25d0784bdad7c83 /xfa/fxfa/parser/cxfa_document.h | |
| parent | 05df075154a832fcb476e1dfcfb865722d0ea898 (diff) | |
| download | pdfium-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_document.h')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_document.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/cxfa_document.h b/xfa/fxfa/parser/cxfa_document.h index b1ee35f07e..0bf7e1989d 100644 --- a/xfa/fxfa/parser/cxfa_document.h +++ b/xfa/fxfa/parser/cxfa_document.h @@ -9,6 +9,7 @@ #include <map> #include <unordered_set> +#include <vector> #include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/xfa_localemgr.h" @@ -70,7 +71,7 @@ class CXFA_Document { CXFA_LocaleMgr* GetLocalMgr(); CXFA_Object* GetXFAObject(XFA_HashCode wsNodeNameHash); CXFA_Node* GetNodeByID(CXFA_Node* pRoot, const CFX_WideStringC& wsID); - CXFA_Node* GetNotBindNode(CXFA_ObjArray& arrayNodes); + CXFA_Node* GetNotBindNode(const std::vector<CXFA_Object*>& arrayNodes); CXFA_LayoutProcessor* GetLayoutProcessor(); CXFA_LayoutProcessor* GetDocLayout(); CXFA_ScriptContext* GetScriptContext(); @@ -105,7 +106,7 @@ class CXFA_Document { void ClearLayoutData(); std::map<uint32_t, CXFA_Node*> m_rgGlobalBinding; - CXFA_NodeArray m_pPendingPageSet; + std::vector<CXFA_Node*> m_pPendingPageSet; protected: CXFA_DocumentParser* m_pParser; |