| Index: xfa/fxfa/parser/cxfa_document.cpp
|
| diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp
|
| index a644c6a92eefda264d544771496f2e5a98e989ad..cc5f74ae23d2b9afb568f6170a65b33035618cac 100644
|
| --- a/xfa/fxfa/parser/cxfa_document.cpp
|
| +++ b/xfa/fxfa/parser/cxfa_document.cpp
|
| @@ -50,7 +50,7 @@ void MergeNodeRecurse(CXFA_Document* pDocument,
|
| }
|
| return;
|
| }
|
| - CXFA_Node* pNewNode = pProtoNode->Clone(TRUE);
|
| + CXFA_Node* pNewNode = pProtoNode->Clone(true);
|
| pNewNode->SetTemplateNode(pProtoNode);
|
| pDestNodeParent->InsertChild(pNewNode, nullptr);
|
| }
|
| @@ -234,7 +234,7 @@ void CXFA_Document::AddPurgeNode(CXFA_Node* pNode) {
|
| m_PurgeNodes.insert(pNode);
|
| }
|
|
|
| -FX_BOOL CXFA_Document::RemovePurgeNode(CXFA_Node* pNode) {
|
| +bool CXFA_Document::RemovePurgeNode(CXFA_Node* pNode) {
|
| return !!m_PurgeNodes.erase(pNode);
|
| }
|
|
|
| @@ -245,29 +245,29 @@ void CXFA_Document::PurgeNodes() {
|
| m_PurgeNodes.clear();
|
| }
|
|
|
| -void CXFA_Document::SetFlag(uint32_t dwFlag, FX_BOOL bOn) {
|
| +void CXFA_Document::SetFlag(uint32_t dwFlag, bool bOn) {
|
| if (bOn)
|
| m_dwDocFlags |= dwFlag;
|
| else
|
| m_dwDocFlags &= ~dwFlag;
|
| }
|
|
|
| -FX_BOOL CXFA_Document::IsInteractive() {
|
| +bool CXFA_Document::IsInteractive() {
|
| if (m_dwDocFlags & XFA_DOCFLAG_HasInteractive)
|
| return !!(m_dwDocFlags & XFA_DOCFLAG_Interactive);
|
|
|
| CXFA_Node* pConfig = ToNode(GetXFAObject(XFA_HASHCODE_Config));
|
| if (!pConfig)
|
| - return FALSE;
|
| + return false;
|
|
|
| CFX_WideString wsInteractive;
|
| CXFA_Node* pPresent = pConfig->GetFirstChildByClass(XFA_Element::Present);
|
| if (!pPresent)
|
| - return FALSE;
|
| + return false;
|
|
|
| CXFA_Node* pPDF = pPresent->GetFirstChildByClass(XFA_Element::Pdf);
|
| if (!pPDF)
|
| - return FALSE;
|
| + return false;
|
|
|
| CXFA_Node* pFormFiller = pPDF->GetChild(0, XFA_Element::Interactive);
|
| if (pFormFiller) {
|
| @@ -275,10 +275,10 @@ FX_BOOL CXFA_Document::IsInteractive() {
|
| if (pFormFiller->TryContent(wsInteractive) &&
|
| wsInteractive == FX_WSTRC(L"1")) {
|
| m_dwDocFlags |= XFA_DOCFLAG_Interactive;
|
| - return TRUE;
|
| + return true;
|
| }
|
| }
|
| - return FALSE;
|
| + return false;
|
| }
|
|
|
| CXFA_LocaleMgr* CXFA_Document::GetLocalMgr() {
|
|
|