diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-30 20:40:10 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-30 20:40:10 +0000 |
commit | 9a2267d2531f4e75a6bcafb48abacfefe8a4a555 (patch) | |
tree | 86e03d0180abbcc49d0d1ae5ce4fcb40aeaaeb33 /fxjs | |
parent | b58bf90755050e1bb6c5d33c329cdaf6cdde36ae (diff) | |
download | pdfium-9a2267d2531f4e75a6bcafb48abacfefe8a4a555.tar.xz |
Move setting of XML content back to specific set methods
This removes the need for the casting as we know the type in the caller.
Change-Id: I9fe30d9f8e6110356549c283980e2f4f37f43d02
Reviewed-on: https://pdfium-review.googlesource.com/19870
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fxjs')
-rw-r--r-- | fxjs/cjx_node.cpp | 57 | ||||
-rw-r--r-- | fxjs/cjx_node.h | 11 |
2 files changed, 32 insertions, 36 deletions
diff --git a/fxjs/cjx_node.cpp b/fxjs/cjx_node.cpp index 338a160e77..6b717f2d9d 100644 --- a/fxjs/cjx_node.cpp +++ b/fxjs/cjx_node.cpp @@ -2944,8 +2944,11 @@ pdfium::Optional<bool> CJX_Node::TryBoolean(XFA_Attribute eAttr, } bool CJX_Node::SetBoolean(XFA_Attribute eAttr, bool bValue, bool bNotify) { - return SetValue(eAttr, XFA_AttributeType::Boolean, (void*)(uintptr_t)bValue, - bNotify); + CFX_XMLElement* elem = SetValue(eAttr, XFA_AttributeType::Boolean, + (void*)(uintptr_t)bValue, bNotify); + if (elem) + elem->SetString(CXFA_Node::AttributeToName(eAttr), bValue ? L"1" : L"0"); + return true; } bool CJX_Node::GetBoolean(XFA_Attribute eAttr) { @@ -2953,8 +2956,13 @@ bool CJX_Node::GetBoolean(XFA_Attribute eAttr) { } bool CJX_Node::SetInteger(XFA_Attribute eAttr, int32_t iValue, bool bNotify) { - return SetValue(eAttr, XFA_AttributeType::Integer, (void*)(uintptr_t)iValue, - bNotify); + CFX_XMLElement* elem = SetValue(eAttr, XFA_AttributeType::Integer, + (void*)(uintptr_t)iValue, bNotify); + if (elem) { + elem->SetString(CXFA_Node::AttributeToName(eAttr), + WideString::Format(L"%d", iValue)); + } + return true; } int32_t CJX_Node::GetInteger(XFA_Attribute eAttr) { @@ -2990,8 +2998,13 @@ pdfium::Optional<XFA_ATTRIBUTEENUM> CJX_Node::TryEnum(XFA_Attribute eAttr, bool CJX_Node::SetEnum(XFA_Attribute eAttr, XFA_ATTRIBUTEENUM eValue, bool bNotify) { - return SetValue(eAttr, XFA_AttributeType::Enum, (void*)(uintptr_t)eValue, - bNotify); + CFX_XMLElement* elem = SetValue(eAttr, XFA_AttributeType::Enum, + (void*)(uintptr_t)eValue, bNotify); + if (elem) { + elem->SetString(CXFA_Node::AttributeToName(eAttr), + CXFA_Node::AttributeEnumToName(eValue)); + } + return true; } XFA_ATTRIBUTEENUM CJX_Node::GetEnum(XFA_Attribute eAttr) { @@ -3179,41 +3192,21 @@ pdfium::Optional<WideString> CJX_Node::TryCData(XFA_Attribute eAttr, return GetXFANode()->GetDefaultCData(eAttr); } -bool CJX_Node::SetValue(XFA_Attribute eAttr, - XFA_AttributeType eType, - void* pValue, - bool bNotify) { +CFX_XMLElement* CJX_Node::SetValue(XFA_Attribute eAttr, + XFA_AttributeType eType, + void* pValue, + bool bNotify) { void* pKey = GetMapKey_Element(GetXFANode()->GetElementType(), eAttr); OnChanging(eAttr, bNotify); SetMapModuleValue(pKey, pValue); OnChanged(eAttr, bNotify, false); if (!GetXFANode()->IsNeedSavingXMLNode()) - return true; + return nullptr; auto* elem = static_cast<CFX_XMLElement*>(GetXFANode()->GetXMLMappingNode()); ASSERT(elem->GetType() == FX_XMLNODE_Element); - switch (eType) { - case XFA_AttributeType::Enum: - elem->SetString( - CXFA_Node::AttributeToName(eAttr), - CXFA_Node::AttributeEnumToName(static_cast<XFA_ATTRIBUTEENUM>( - reinterpret_cast<uintptr_t>(pValue)))); - break; - case XFA_AttributeType::Boolean: - elem->SetString(CXFA_Node::AttributeToName(eAttr), pValue ? L"1" : L"0"); - break; - case XFA_AttributeType::Integer: { - elem->SetString( - CXFA_Node::AttributeToName(eAttr), - WideString::Format(L"%d", static_cast<int32_t>( - reinterpret_cast<uintptr_t>(pValue)))); - break; - } - default: - ASSERT(0); - } - return true; + return elem; } // TODO(dsinclair): This should not be needed. Nodes should get un-bound when diff --git a/fxjs/cjx_node.h b/fxjs/cjx_node.h index 148f1a6378..a860db9155 100644 --- a/fxjs/cjx_node.h +++ b/fxjs/cjx_node.h @@ -29,6 +29,7 @@ enum XFA_SOM_MESSAGETYPE { XFA_SOM_MandatoryMessage }; +class CFX_XMLElement; class CFXJSE_Arguments; class CXFA_CalcData; class CXFA_LayoutItem; @@ -434,10 +435,12 @@ class CJX_Node : public CJX_Object { void OnChanging(XFA_Attribute eAttr, bool bNotify); void SendAttributeChangeMessage(XFA_Attribute eAttribute, bool bScriptModify); - bool SetValue(XFA_Attribute eAttr, - XFA_AttributeType eType, - void* pValue, - bool bNotify); + // Returns a pointer to the XML node that needs to be updated with the new + // attribute value. |nullptr| if no update is needed. + CFX_XMLElement* SetValue(XFA_Attribute eAttr, + XFA_AttributeType eType, + void* pValue, + bool bNotify); bool TryUserData(void* pKey, void*& pData, bool bProtoAlso); |