Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Side by Side Diff: xfa/fxfa/parser/xfa_object_imp.cpp

Issue 1821043003: Remove FX_WORD in favor of uint16_t. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Use stdint.h directly, bitfield minefield. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « xfa/fxfa/parser/xfa_object.h ('k') | xfa/fxfa/parser/xfa_parser_imp.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "xfa/fxfa/parser/xfa_object.h" 7 #include "xfa/fxfa/parser/xfa_object.h"
8 8
9 #include "core/include/fxcrt/fx_ext.h" 9 #include "core/include/fxcrt/fx_ext.h"
10 #include "xfa/fgas/crt/fgas_codepage.h" 10 #include "xfa/fgas/crt/fgas_codepage.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 if (pData) { 78 if (pData) {
79 CFX_WideString* pNewData = new CFX_WideString(*(CFX_WideString*)pData); 79 CFX_WideString* pNewData = new CFX_WideString(*(CFX_WideString*)pData);
80 pData = pNewData; 80 pData = pNewData;
81 } 81 }
82 } 82 }
83 static XFA_MAPDATABLOCKCALLBACKINFO deleteWideStringCallBack = { 83 static XFA_MAPDATABLOCKCALLBACKINFO deleteWideStringCallBack = {
84 XFA_DeleteWideString, XFA_CopyWideString}; 84 XFA_DeleteWideString, XFA_CopyWideString};
85 static XFA_OBJECTTYPE XFA_GetElementObjectType(XFA_ELEMENT eElement) { 85 static XFA_OBJECTTYPE XFA_GetElementObjectType(XFA_ELEMENT eElement) {
86 return (XFA_OBJECTTYPE)XFA_GetElementByID(eElement)->eObjectType; 86 return (XFA_OBJECTTYPE)XFA_GetElementByID(eElement)->eObjectType;
87 } 87 }
88 CXFA_Node::CXFA_Node(CXFA_Document* pDoc, FX_WORD ePacket, XFA_ELEMENT eElement) 88 CXFA_Node::CXFA_Node(CXFA_Document* pDoc,
89 uint16_t ePacket,
90 XFA_ELEMENT eElement)
89 : CXFA_Object(pDoc, XFA_GetElementObjectType(eElement)), 91 : CXFA_Object(pDoc, XFA_GetElementObjectType(eElement)),
90 m_pNext(nullptr), 92 m_pNext(nullptr),
91 m_pChild(nullptr), 93 m_pChild(nullptr),
92 m_pLastChild(nullptr), 94 m_pLastChild(nullptr),
93 m_pParent(nullptr), 95 m_pParent(nullptr),
94 m_pXMLNode(nullptr), 96 m_pXMLNode(nullptr),
95 m_eNodeClass(eElement), 97 m_eNodeClass(eElement),
96 m_ePacket(ePacket), 98 m_ePacket(ePacket),
97 m_dwNameHash(0), 99 m_dwNameHash(0),
98 m_pAuxNode(nullptr), 100 m_pAuxNode(nullptr),
(...skipping 5301 matching lines...) Expand 10 before | Expand all | Expand 10 after
5400 return m_pAttachNode->InsertChild(pNewNode, pBeforeNode); 5402 return m_pAttachNode->InsertChild(pNewNode, pBeforeNode);
5401 } 5403 }
5402 FX_BOOL CXFA_AttachNodeList::Remove(CXFA_Node* pNode) { 5404 FX_BOOL CXFA_AttachNodeList::Remove(CXFA_Node* pNode) {
5403 return m_pAttachNode->RemoveChild(pNode); 5405 return m_pAttachNode->RemoveChild(pNode);
5404 } 5406 }
5405 CXFA_Node* CXFA_AttachNodeList::Item(int32_t iIndex) { 5407 CXFA_Node* CXFA_AttachNodeList::Item(int32_t iIndex) {
5406 return m_pAttachNode->GetChild( 5408 return m_pAttachNode->GetChild(
5407 iIndex, XFA_ELEMENT_UNKNOWN, 5409 iIndex, XFA_ELEMENT_UNKNOWN,
5408 m_pAttachNode->GetClassID() == XFA_ELEMENT_Subform); 5410 m_pAttachNode->GetClassID() == XFA_ELEMENT_Subform);
5409 } 5411 }
OLDNEW
« no previous file with comments | « xfa/fxfa/parser/xfa_object.h ('k') | xfa/fxfa/parser/xfa_parser_imp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698