From d32fa8b75a3af1cddc4517a3085a43f7a3544c90 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 7 Nov 2017 20:10:51 +0000 Subject: Rename CXFA_Fill to CXFA_FillData This CL renames CXFA_Fill to CXFA_FillData to show it is part of the data hierarchy. Change-Id: I4f1f3e83621dee4f9ccddb3b3d04785d094315b8 Reviewed-on: https://pdfium-review.googlesource.com/17981 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- fxjs/cjx_node.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'fxjs/cjx_node.cpp') diff --git a/fxjs/cjx_node.cpp b/fxjs/cjx_node.cpp index c82a9f4912..490e3a1094 100644 --- a/fxjs/cjx_node.cpp +++ b/fxjs/cjx_node.cpp @@ -1580,24 +1580,24 @@ void CJX_Node::Script_Som_FillColor(CFXJSE_Value* pValue, bool bSetting, XFA_ATTRIBUTE eAttribute) { CXFA_WidgetData* pWidgetData = GetXFANode()->GetWidgetData(); - if (!pWidgetData) { + if (!pWidgetData) return; - } + CXFA_BorderData borderData = pWidgetData->GetBorderData(true); - CXFA_Fill borderfill = borderData.GetFill(true); - CXFA_Node* pNode = borderfill.GetNode(); - if (!pNode) { + CXFA_FillData borderfillData = borderData.GetFillData(true); + CXFA_Node* pNode = borderfillData.GetNode(); + if (!pNode) return; - } + if (bSetting) { int32_t r; int32_t g; int32_t b; StrToRGB(pValue->ToWideString(), r, g, b); FX_ARGB color = ArgbEncode(0xff, r, g, b); - borderfill.SetColor(color); + borderfillData.SetColor(color); } else { - FX_ARGB color = borderfill.GetColor(); + FX_ARGB color = borderfillData.GetColor(); int32_t a; int32_t r; int32_t g; -- cgit v1.2.3