diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-12-14 20:43:53 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-14 20:43:53 +0000 |
| commit | 51ef4a6ca3b4ae9b618cb1c96f84697a2bf4a2b1 (patch) | |
| tree | a365a0c3f25fff2f6511fbc23fd0e4d6b8d4eada /xfa/fxfa/parser/cxfa_captiondata.cpp | |
| parent | 8489e901fb16fe508e23a36cd3eff93d8332c2a2 (diff) | |
| download | pdfium-51ef4a6ca3b4ae9b618cb1c96f84697a2bf4a2b1.tar.xz | |
Change CXFA_Node::GetChild to return proper types
Currently CXFA_Node::GetChild always returns a CXFA_Node* object. We
know the type we want when we call GetChild, so this CL changes the code
to add a template parameter to GetChild and return the correct CXFA_Node
subtype for the desired element.
Change-Id: I5aecf2e840504235dc246483abee48e0564841fe
Reviewed-on: https://pdfium-review.googlesource.com/21210
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_captiondata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_captiondata.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/xfa/fxfa/parser/cxfa_captiondata.cpp b/xfa/fxfa/parser/cxfa_captiondata.cpp index e48e5f34bb..59dbb2b008 100644 --- a/xfa/fxfa/parser/cxfa_captiondata.cpp +++ b/xfa/fxfa/parser/cxfa_captiondata.cpp @@ -6,6 +6,8 @@ #include "xfa/fxfa/parser/cxfa_captiondata.h" +#include "xfa/fxfa/parser/cxfa_font.h" +#include "xfa/fxfa/parser/cxfa_margin.h" #include "xfa/fxfa/parser/cxfa_measurement.h" #include "xfa/fxfa/parser/cxfa_node.h" #include "xfa/fxfa/parser/cxfa_value.h" @@ -39,16 +41,17 @@ float CXFA_CaptionData::GetReserve() const { CXFA_MarginData CXFA_CaptionData::GetMarginData() const { return CXFA_MarginData( - m_pNode ? m_pNode->GetChild(0, XFA_Element::Margin, false) : nullptr); + m_pNode ? m_pNode->GetChild<CXFA_Margin>(0, XFA_Element::Margin, false) + : nullptr); } CXFA_FontData CXFA_CaptionData::GetFontData() const { - return CXFA_FontData(m_pNode ? m_pNode->GetChild(0, XFA_Element::Font, false) - : nullptr); + return CXFA_FontData( + m_pNode ? m_pNode->GetChild<CXFA_Font>(0, XFA_Element::Font, false) + : nullptr); } CXFA_Value* CXFA_CaptionData::GetValue() const { - return m_pNode ? static_cast<CXFA_Value*>( - m_pNode->GetChild(0, XFA_Element::Value, false)) + return m_pNode ? m_pNode->GetChild<CXFA_Value>(0, XFA_Element::Value, false) : nullptr; } |