diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-02 19:09:58 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-02 19:09:58 +0000 |
| commit | 3ac07ffafea1ee4d3cf985e32692849dd3fcfdfb (patch) | |
| tree | 3edbd3db87541a57fa0ee172bd50b70d35d45a11 /xfa/fxfa/parser/cxfa_font.cpp | |
| parent | bf29e5b532e4ef9a309906083b33b6d4c48ff757 (diff) | |
| download | pdfium-3ac07ffafea1ee4d3cf985e32692849dd3fcfdfb.tar.xz | |
Cleanup params to CJX_Node::TryCData
This CL removes the bProto param as it was never set and inlines the
value where needed in the methods. The default value was removed from
bUseDefault and inlined into callsites as needed.
Change-Id: I773261d19aa3799bc607e7df482b5f5e5217bee6
Reviewed-on: https://pdfium-review.googlesource.com/17533
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_font.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_font.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fxfa/parser/cxfa_font.cpp b/xfa/fxfa/parser/cxfa_font.cpp index 4fc0a57092..d54ac0ba72 100644 --- a/xfa/fxfa/parser/cxfa_font.cpp +++ b/xfa/fxfa/parser/cxfa_font.cpp @@ -21,21 +21,21 @@ float CXFA_Font::GetBaselineShift() { float CXFA_Font::GetHorizontalScale() { WideString wsValue; - m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_FontHorizontalScale, wsValue); + m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_FontHorizontalScale, wsValue, true); int32_t iScale = FXSYS_wtoi(wsValue.c_str()); return iScale > 0 ? (float)iScale : 100.0f; } float CXFA_Font::GetVerticalScale() { WideString wsValue; - m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_FontVerticalScale, wsValue); + m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_FontVerticalScale, wsValue, true); int32_t iScale = FXSYS_wtoi(wsValue.c_str()); return iScale > 0 ? (float)iScale : 100.0f; } float CXFA_Font::GetLetterSpacing() { WideStringView wsValue; - if (!m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_LetterSpacing, wsValue)) + if (!m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_LetterSpacing, wsValue, true)) return 0; CXFA_Measurement ms(wsValue); @@ -69,7 +69,7 @@ float CXFA_Font::GetFontSize() { } void CXFA_Font::GetTypeface(WideStringView& wsTypeFace) { - m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Typeface, wsTypeFace); + m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Typeface, wsTypeFace, true); } bool CXFA_Font::IsBold() { |