diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-02 19:20:38 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-02 19:20:38 +0000 |
| commit | 63c405d24019cab46dc6c833887dd3e18d3f1b5a (patch) | |
| tree | 745d200becb89a6811b943e9a42c6391dc1a1d01 | |
| parent | 7f571083e35bc4056515f64c7adb7325f1a27b57 (diff) | |
| download | pdfium-63c405d24019cab46dc6c833887dd3e18d3f1b5a.tar.xz | |
Remove default values from CJX_Node::{Set|Try}Boolean
This CL removes the default values and inlines into the call sites.
Change-Id: I922d40550384196b4288a648043d267538a66095
Reviewed-on: https://pdfium-review.googlesource.com/17590
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
| -rw-r--r-- | fxjs/cjx_node.h | 4 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_widgetdata.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/fxjs/cjx_node.h b/fxjs/cjx_node.h index 66893f2d3d..12b151c6b7 100644 --- a/fxjs/cjx_node.h +++ b/fxjs/cjx_node.h @@ -100,8 +100,8 @@ class CJX_Node : public CJX_Object { bool SetEnum(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTEENUM eValue, bool bNotify); XFA_ATTRIBUTEENUM GetEnum(XFA_ATTRIBUTE eAttr); - bool TryBoolean(XFA_ATTRIBUTE eAttr, bool& bValue, bool bUseDefault = true); - bool SetBoolean(XFA_ATTRIBUTE eAttr, bool bValue, bool bNotify = false); + bool TryBoolean(XFA_ATTRIBUTE eAttr, bool& bValue, bool bUseDefault); + bool SetBoolean(XFA_ATTRIBUTE eAttr, bool bValue, bool bNotify); bool GetBoolean(XFA_ATTRIBUTE eAttr); bool TryMeasure(XFA_ATTRIBUTE eAttr, diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index 2dad661c5a..eee383ba63 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -992,7 +992,7 @@ void CXFA_WidgetData::InsertItem(const WideString& wsLabel, InsertListTextItem(pItems, wsLabel, nIndex); CXFA_Node* pSaveItems = m_pNode->CreateSamePacketNode(XFA_Element::Items); m_pNode->InsertChild(-1, pSaveItems); - pSaveItems->JSNode()->SetBoolean(XFA_ATTRIBUTE_Save, true); + pSaveItems->JSNode()->SetBoolean(XFA_ATTRIBUTE_Save, true, false); InsertListTextItem(pSaveItems, wsNewValue, nIndex); } else if (listitems.size() > 1) { for (int32_t i = 0; i < 2; i++) { @@ -1005,12 +1005,12 @@ void CXFA_WidgetData::InsertItem(const WideString& wsLabel, } } else { CXFA_Node* pNode = listitems[0]; - pNode->JSNode()->SetBoolean(XFA_ATTRIBUTE_Save, false); + pNode->JSNode()->SetBoolean(XFA_ATTRIBUTE_Save, false, false); pNode->JSNode()->SetEnum(XFA_ATTRIBUTE_Presence, XFA_ATTRIBUTEENUM_Visible, false); CXFA_Node* pSaveItems = m_pNode->CreateSamePacketNode(XFA_Element::Items); m_pNode->InsertChild(-1, pSaveItems); - pSaveItems->JSNode()->SetBoolean(XFA_ATTRIBUTE_Save, true); + pSaveItems->JSNode()->SetBoolean(XFA_ATTRIBUTE_Save, true, false); pSaveItems->JSNode()->SetEnum(XFA_ATTRIBUTE_Presence, XFA_ATTRIBUTEENUM_Hidden, false); CXFA_Node* pListNode = pNode->GetNodeItem(XFA_NODEITEM_FirstChild); @@ -1292,7 +1292,7 @@ bool CXFA_WidgetData::GetBarcodeAttribute_PrintChecksum(bool* val) { CXFA_Node* pUIChild = GetUIChild(); bool bPrintCheckDigit; if (pUIChild->JSNode()->TryBoolean(XFA_ATTRIBUTE_PrintCheckDigit, - bPrintCheckDigit)) { + bPrintCheckDigit, true)) { *val = bPrintCheckDigit; return true; } @@ -1330,7 +1330,7 @@ bool CXFA_WidgetData::GetBarcodeAttribute_TextLocation(int32_t* val) { bool CXFA_WidgetData::GetBarcodeAttribute_Truncate(bool* val) { CXFA_Node* pUIChild = GetUIChild(); bool bTruncate; - if (!pUIChild->JSNode()->TryBoolean(XFA_ATTRIBUTE_Truncate, bTruncate)) + if (!pUIChild->JSNode()->TryBoolean(XFA_ATTRIBUTE_Truncate, bTruncate, true)) return false; *val = bTruncate; |