summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/cxfa_layoutpagemgr.h
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2017-01-05 12:18:41 -0800
committerCommit bot <commit-bot@chromium.org>2017-01-05 12:18:41 -0800
commit6bb3b894488fd6f38c096b708980a9f08286ac5c (patch)
tree2360efbf1aa5f2c452ca350382483d1c6b693f23 /xfa/fxfa/parser/cxfa_layoutpagemgr.h
parent48f776f7e801d719683b251dc21ee8c0e3250d90 (diff)
downloadpdfium-6bb3b894488fd6f38c096b708980a9f08286ac5c.tar.xz
Remove CFX_MapPtrToPtr from xfa/fxfa.
Review-Url: https://codereview.chromium.org/2612923002
Diffstat (limited to 'xfa/fxfa/parser/cxfa_layoutpagemgr.h')
-rw-r--r--xfa/fxfa/parser/cxfa_layoutpagemgr.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/cxfa_layoutpagemgr.h b/xfa/fxfa/parser/cxfa_layoutpagemgr.h
index b466f3ad1f..1133e1778a 100644
--- a/xfa/fxfa/parser/cxfa_layoutpagemgr.h
+++ b/xfa/fxfa/parser/cxfa_layoutpagemgr.h
@@ -9,6 +9,7 @@
#include <iterator>
#include <list>
+#include <map>
#include "xfa/fxfa/parser/xfa_layout_itemlayout.h"
@@ -119,7 +120,7 @@ class CXFA_LayoutPageMgr {
bool GetNextContentArea(CXFA_Node* pTargetContentArea);
void InitPageSetMap();
void ProcessLastPageSet();
- inline bool IsPageSetRootOrderedOccurrence() {
+ bool IsPageSetRootOrderedOccurrence() const {
return m_ePageSetMode == XFA_ATTRIBUTEENUM_OrderedOccurrence;
}
void ClearData();
@@ -127,6 +128,7 @@ class CXFA_LayoutPageMgr {
void LayoutPageSetContents();
void PrepareLayout();
void SaveLayoutItem(CXFA_LayoutItem* pParentLayoutItem);
+
CXFA_LayoutProcessor* m_pLayoutProcessor;
CXFA_Node* m_pTemplatePageSetRoot;
CXFA_ContainerLayoutItem* m_pPageSetLayoutItemRoot;
@@ -138,7 +140,7 @@ class CXFA_LayoutPageMgr {
int32_t m_nCurPageCount;
XFA_ATTRIBUTEENUM m_ePageSetMode;
bool m_bCreateOverFlowPage;
- CFX_MapPtrTemplate<CXFA_Node*, int32_t> m_pPageSetMap;
+ std::map<CXFA_Node*, int32_t> m_pPageSetMap;
CFX_ArrayTemplate<CXFA_ContainerLayoutItem*> m_PageArray;
};