diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-14 21:19:44 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-14 21:19:44 +0000 |
commit | aee28693976cc246eea8230a999906802e52cab7 (patch) | |
tree | 612e6dbc9b79c978208a623138f70f881acb539f /xfa/fxfa/parser/cxfa_fontdata.cpp | |
parent | 5a423ef8708e61d43f1556ab09c2e09f496d700d (diff) | |
download | pdfium-aee28693976cc246eea8230a999906802e52cab7.tar.xz |
Cleanup XFA default value code
This CL adds helper methods to CXFA_Node to retrieve the default values
for attributes with the correct data types.
Change-Id: I644435b4b430819f1060a95fa4fffe4ba2826cfe
Reviewed-on: https://pdfium-review.googlesource.com/18450
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_fontdata.cpp')
-rw-r--r-- | xfa/fxfa/parser/cxfa_fontdata.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fxfa/parser/cxfa_fontdata.cpp b/xfa/fxfa/parser/cxfa_fontdata.cpp index f5fe270f18..87bea1714f 100644 --- a/xfa/fxfa/parser/cxfa_fontdata.cpp +++ b/xfa/fxfa/parser/cxfa_fontdata.cpp @@ -35,11 +35,11 @@ float CXFA_FontData::GetVerticalScale() { } float CXFA_FontData::GetLetterSpacing() { - WideStringView wsValue; + WideString wsValue; if (!m_pNode->JSNode()->TryCData(XFA_Attribute::LetterSpacing, wsValue, true)) return 0; - CXFA_Measurement ms(wsValue); + CXFA_Measurement ms(wsValue.AsStringView()); if (ms.GetUnit() == XFA_Unit::Em) return ms.GetValue() * GetFontSize(); return ms.ToUnit(XFA_Unit::Pt); @@ -69,7 +69,7 @@ float CXFA_FontData::GetFontSize() { return ms.ToUnit(XFA_Unit::Pt); } -void CXFA_FontData::GetTypeface(WideStringView& wsTypeFace) { +void CXFA_FontData::GetTypeface(WideString& wsTypeFace) { m_pNode->JSNode()->TryCData(XFA_Attribute::Typeface, wsTypeFace, true); } |