From 2501ae2474c1f097a06634d647de2eb3fb730864 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 20 Nov 2017 21:19:13 +0000 Subject: Remove CXFA_DataData operator bool override This CL removes CXFA_DataData::operator bool in favour of an explicit HasValidNode method. This makes the call sites a lot clearer. Change-Id: I6fae14fdeec4674ca7916e21b9e5703070fc3069 Reviewed-on: https://pdfium-review.googlesource.com/18830 Commit-Queue: dsinclair Reviewed-by: Ryan Harrison --- xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'xfa/fxfa/parser/xfa_document_datamerger_imp.cpp') diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp index ac7fb2ec85..9e33b72936 100644 --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp @@ -141,7 +141,7 @@ void CreateDataBinding(CXFA_Node* pFormNode, CXFA_ImageData imageData = defValueData.GetImageData(); WideString wsContentType; WideString wsHref; - if (imageData) { + if (imageData.HasValidNode()) { imageData.GetContent(wsValue); imageData.GetContentType(wsContentType); imageData.GetHref(wsHref); @@ -297,7 +297,7 @@ void CreateDataBinding(CXFA_Node* pFormNode, FormValueNode_SetChildContent(defValueData.GetNode(), wsNormalizeValue, XFA_Element::Image); CXFA_ImageData imageData = defValueData.GetImageData(); - if (imageData) { + if (imageData.HasValidNode()) { CFX_XMLElement* pXMLDataElement = static_cast(pDataNode->GetXMLMappingNode()); ASSERT(pXMLDataElement); @@ -333,7 +333,8 @@ void CreateDataBinding(CXFA_Node* pFormNode, wsNormalizeValue += wsItem; } CXFA_ExDataData exData = defValueData.GetExData(); - ASSERT(exData); + ASSERT(exData.HasValidNode()); + exData.SetContentType(single ? L"text/plain" : L"text/xml"); } FormValueNode_SetChildContent(defValueData.GetNode(), wsNormalizeValue, -- cgit v1.2.3