diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-01-18 12:47:24 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-01-18 18:06:19 +0000 |
| commit | 19c209de418a10f7d5c157cdda38e9308bfa5503 (patch) | |
| tree | 5c5428d219f74cd02f8d36adc4e33c2e1b97f81a /xfa/fxfa/app/cxfa_textparser.cpp | |
| parent | be591066c781850caf13d2b7a7070c6da4eda467 (diff) | |
| download | pdfium-19c209de418a10f7d5c157cdda38e9308bfa5503.tar.xz | |
Split CFDE_CSSPrimitiveValue apart
This CL splits the CFDE_CSSPrimitiveValue class into individual classes per
value type. This moves the numeric itypes out of the FDE_CSSPrimitiveType
list and creates a new CFDE_CSSNumberType list.
Change-Id: I6f55e9e3509de7ff1e82dcf018a1f1c472565e54
Reviewed-on: https://pdfium-review.googlesource.com/2250
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/app/cxfa_textparser.cpp')
| -rw-r--r-- | xfa/fxfa/app/cxfa_textparser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xfa/fxfa/app/cxfa_textparser.cpp b/xfa/fxfa/app/cxfa_textparser.cpp index a0da99c8dc..1f8036937e 100644 --- a/xfa/fxfa/app/cxfa_textparser.cpp +++ b/xfa/fxfa/app/cxfa_textparser.cpp @@ -342,7 +342,7 @@ bool CXFA_TextParser::IsSpaceRun(CFDE_CSSComputedStyle* pStyle) const { CFX_RetainPtr<CFGAS_GEFont> CXFA_TextParser::GetFont( CXFA_TextProvider* pTextProvider, CFDE_CSSComputedStyle* pStyle) const { - CFX_WideStringC wsFamily = FX_WSTRC(L"Courier"); + CFX_WideStringC wsFamily = L"Courier"; uint32_t dwStyle = 0; CXFA_Font font = pTextProvider->GetFontNode(); if (font) { @@ -356,7 +356,7 @@ CFX_RetainPtr<CFGAS_GEFont> CXFA_TextParser::GetFont( if (pStyle) { int32_t iCount = pStyle->CountFontFamilies(); if (iCount > 0) - wsFamily = pStyle->GetFontFamily(iCount - 1); + wsFamily = pStyle->GetFontFamily(iCount - 1).AsStringC(); dwStyle = 0; if (pStyle->GetFontWeight() > FXFONT_FW_NORMAL) |