diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-22 22:09:42 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-22 22:09:42 +0000 |
commit | fd16e44aa9b0e63e6d25254a3b812fb27152b6f4 (patch) | |
tree | 92092b4cc86a05f90518b63c4f884566380bfd92 /xfa/fxfa/parser/cxfa_valuedata.cpp | |
parent | 9d0d36b7f3e2106bbeb332edf821fc2c637e6ea0 (diff) | |
download | pdfium-fd16e44aa9b0e63e6d25254a3b812fb27152b6f4.tar.xz |
Cleanup CXFA_ValueData
This CL makes the methods const and uses return values instead of
out-params.
Change-Id: If760cd8c10d8f3a94dd3e13c46200cb6738a4d5a
Reviewed-on: https://pdfium-review.googlesource.com/19150
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_valuedata.cpp')
-rw-r--r-- | xfa/fxfa/parser/cxfa_valuedata.cpp | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/xfa/fxfa/parser/cxfa_valuedata.cpp b/xfa/fxfa/parser/cxfa_valuedata.cpp index 1ca051e637..d0f86a8b23 100644 --- a/xfa/fxfa/parser/cxfa_valuedata.cpp +++ b/xfa/fxfa/parser/cxfa_valuedata.cpp @@ -8,7 +8,7 @@ #include "xfa/fxfa/parser/cxfa_node.h" -XFA_Element CXFA_ValueData::GetChildValueClassID() { +XFA_Element CXFA_ValueData::GetChildValueClassID() const { if (!m_pNode) return XFA_Element::Unknown; if (CXFA_Node* pNode = m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild)) @@ -16,49 +16,43 @@ XFA_Element CXFA_ValueData::GetChildValueClassID() { return XFA_Element::Unknown; } -bool CXFA_ValueData::GetChildValueContent(WideString& wsContent) { +WideString CXFA_ValueData::GetChildValueContent() const { if (!m_pNode) - return false; + return L""; CXFA_Node* pNode = m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild); if (!pNode) - return false; + return L""; - pdfium::Optional<WideString> content = - pNode->JSNode()->TryContent(false, true); - if (!content) - return false; - - wsContent = *content; - return true; + return pNode->JSNode()->TryContent(false, true).value_or(L""); } -CXFA_ArcData CXFA_ValueData::GetArcData() { +CXFA_ArcData CXFA_ValueData::GetArcData() const { return CXFA_ArcData(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild) : nullptr); } -CXFA_LineData CXFA_ValueData::GetLineData() { +CXFA_LineData CXFA_ValueData::GetLineData() const { return CXFA_LineData(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild) : nullptr); } -CXFA_RectangleData CXFA_ValueData::GetRectangleData() { +CXFA_RectangleData CXFA_ValueData::GetRectangleData() const { return CXFA_RectangleData( m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild) : nullptr); } -CXFA_TextData CXFA_ValueData::GetTextData() { +CXFA_TextData CXFA_ValueData::GetTextData() const { return CXFA_TextData(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild) : nullptr); } -CXFA_ExDataData CXFA_ValueData::GetExData() { +CXFA_ExDataData CXFA_ValueData::GetExData() const { return CXFA_ExDataData(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild) : nullptr); } -CXFA_ImageData CXFA_ValueData::GetImageData() { +CXFA_ImageData CXFA_ValueData::GetImageData() const { return CXFA_ImageData(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild) : nullptr); } |