diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-07 20:30:40 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-07 20:30:40 +0000 |
| commit | 73c4b0fe5dd1e1924b2cd7b19910ef9d86dcc9ab (patch) | |
| tree | efeab8632b17781ed26817d4bad23362854b8c52 /xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | |
| parent | 4d48bbfd5378ffe70a17ad613b9c167ad3ef03b2 (diff) | |
| download | pdfium-73c4b0fe5dd1e1924b2cd7b19910ef9d86dcc9ab.tar.xz | |
Rename CXFA_Image to CXFA_ImageData
This CL renames CXFA_Image to CXFA_ImageData to make it clear it's part
of the data hierarchy.
Change-Id: Ia593ef3c9deb872db11f8246b13ef3c39a90d4c7
Reviewed-on: https://pdfium-review.googlesource.com/17984
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/xfa_document_datamerger_imp.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp index 37d8084399..a6441a68db 100644 --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp @@ -138,13 +138,13 @@ void CreateDataBinding(CXFA_Node* pFormNode, WideString wsFormattedValue; switch (eUIType) { case XFA_Element::ImageEdit: { - CXFA_Image image = defValue.GetImage(); + CXFA_ImageData imageData = defValue.GetImageData(); WideString wsContentType; WideString wsHref; - if (image) { - image.GetContent(wsValue); - image.GetContentType(wsContentType); - image.GetHref(wsHref); + if (imageData) { + imageData.GetContent(wsValue); + imageData.GetContentType(wsContentType); + imageData.GetHref(wsHref); } CFX_XMLElement* pXMLDataElement = static_cast<CFX_XMLElement*>(pDataNode->GetXMLMappingNode()); @@ -297,8 +297,8 @@ void CreateDataBinding(CXFA_Node* pFormNode, case XFA_Element::ImageEdit: { FormValueNode_SetChildContent(defValue.GetNode(), wsNormalizeValue, XFA_Element::Image); - CXFA_Image image = defValue.GetImage(); - if (image) { + CXFA_ImageData imageData = defValue.GetImageData(); + if (imageData) { CFX_XMLElement* pXMLDataElement = static_cast<CFX_XMLElement*>(pDataNode->GetXMLMappingNode()); ASSERT(pXMLDataElement); @@ -308,12 +308,12 @@ void CreateDataBinding(CXFA_Node* pFormNode, if (!wsContentType.IsEmpty()) { pDataNode->JSNode()->SetCData(XFA_ATTRIBUTE_ContentType, wsContentType, false, false); - image.SetContentType(wsContentType); + imageData.SetContentType(wsContentType); } WideString wsHref = pXMLDataElement->GetString(L"href"); if (!wsHref.IsEmpty()) - image.SetHref(wsHref); + imageData.SetHref(wsHref); } break; } |