diff options
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.cpp | 18 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.h | 16 |
2 files changed, 13 insertions, 21 deletions
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 603473c61c..3ada2aa4d9 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -575,15 +575,7 @@ CXFA_Node::CXFA_Node(CXFA_Document* pDoc, m_Properties(properties), m_Attributes(attributes), m_ValidPackets(validPackets), - parent_(nullptr), - next_sibling_(nullptr), - prev_sibling_(nullptr), - first_child_(nullptr), - last_child_(nullptr), - m_ePacket(ePacket), - m_uNodeFlags(XFA_NodeFlag_None), - m_dwNameHash(0), - m_pAuxNode(nullptr) { + m_ePacket(ePacket) { ASSERT(m_pDocument); } @@ -3403,10 +3395,10 @@ bool CXFA_Node::FindSplitPos(CXFA_FFDocView* docView, if (iLineNum >= iLinesCount) { if (*pCalcHeight - fStartOffset - fTextHeight >= fFontSize) { if (iFieldSplitCount / 3 == (iBlockIndex + 1)) { - (*pFieldArray)[iBlockIndex * 3 + 1] = (float)iLinesCount; + (*pFieldArray)[iBlockIndex * 3 + 1] = iLinesCount; (*pFieldArray)[iBlockIndex * 3 + 2] = *pCalcHeight; } else { - pFieldArray->push_back((float)iLinesCount); + pFieldArray->push_back(iLinesCount); pFieldArray->push_back(*pCalcHeight); } return false; @@ -3424,10 +3416,10 @@ bool CXFA_Node::FindSplitPos(CXFA_FFDocView* docView, if (iLineNum > 0) { float fSplitHeight = iLineNum * fLineHeight + fCapReserve + fStartOffset; if (iFieldSplitCount / 3 == (iBlockIndex + 1)) { - (*pFieldArray)[iBlockIndex * 3 + 1] = (float)iLineNum; + (*pFieldArray)[iBlockIndex * 3 + 1] = iLineNum; (*pFieldArray)[iBlockIndex * 3 + 2] = fSplitHeight; } else { - pFieldArray->push_back((float)iLineNum); + pFieldArray->push_back(iLineNum); pFieldArray->push_back(fSplitHeight); } if (fabs(fSplitHeight - *pCalcHeight) < XFA_FLOAT_PERCISION) diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index 3b3345b562..ab06b4b4b7 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -494,18 +494,18 @@ class CXFA_Node : public CXFA_Object { // pointers within the tree (or in objects owned by nodes in the tree) // can't be UnownedPtr<> because the cleanup process will remove the nodes // in an order that doesn't necessarily match up to the tree structure. - CXFA_Node* parent_; // Raw, intra-tree node pointer. - CXFA_Node* next_sibling_; // Raw, intra-tree node pointer. - CXFA_Node* prev_sibling_; // Raw, intra-tree node pointer. - CXFA_Node* first_child_; // Raw, intra-tree node pointer. - CXFA_Node* last_child_; // Raw, intra-tree node pointer. + CXFA_Node* parent_ = nullptr; // Raw, intra-tree node pointer. + CXFA_Node* next_sibling_ = nullptr; // Raw, intra-tree node pointer. + CXFA_Node* prev_sibling_ = nullptr; // Raw, intra-tree node pointer. + CXFA_Node* first_child_ = nullptr; // Raw, intra-tree node pointer. + CXFA_Node* last_child_ = nullptr; // Raw, intra-tree node pointer. UnownedPtr<CFX_XMLNode> xml_node_; const XFA_PacketType m_ePacket; uint8_t m_ExecuteRecursionDepth = 0; - uint16_t m_uNodeFlags; - uint32_t m_dwNameHash; - CXFA_Node* m_pAuxNode; // Raw, node tree cleanup order. + uint16_t m_uNodeFlags = XFA_NodeFlag_None; + uint32_t m_dwNameHash = 0; + CXFA_Node* m_pAuxNode = nullptr; // Raw, node tree cleanup order. std::vector<UnownedPtr<CXFA_Node>> binding_nodes_; bool m_bIsNull = true; bool m_bPreNull = true; |