Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Side by Side Diff: xfa/fxfa/parser/cxfa_font.cpp

Issue 1882043004: Remove implicit cast from CFX_WideString to (const wchar_t*) (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: win error #2 Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « xfa/fxfa/fm2js/xfa_fmparse.cpp ('k') | xfa/fxfa/parser/cxfa_widgetdata.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 PDFium Authors. All rights reserved. 1 // Copyright 2016 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "xfa/fxfa/parser/cxfa_font.h" 7 #include "xfa/fxfa/parser/cxfa_font.h"
8 8
9 #include "core/fxge/include/fx_dib.h" 9 #include "core/fxge/include/fx_dib.h"
10 #include "xfa/fxfa/parser/cxfa_fill.h" 10 #include "xfa/fxfa/parser/cxfa_fill.h"
11 #include "xfa/fxfa/parser/xfa_object.h" 11 #include "xfa/fxfa/parser/xfa_object.h"
12 12
13 CXFA_Font::CXFA_Font(CXFA_Node* pNode) : CXFA_Data(pNode) {} 13 CXFA_Font::CXFA_Font(CXFA_Node* pNode) : CXFA_Data(pNode) {}
14 14
15 FX_FLOAT CXFA_Font::GetBaselineShift() { 15 FX_FLOAT CXFA_Font::GetBaselineShift() {
16 return m_pNode->GetMeasure(XFA_ATTRIBUTE_BaselineShift).ToUnit(XFA_UNIT_Pt); 16 return m_pNode->GetMeasure(XFA_ATTRIBUTE_BaselineShift).ToUnit(XFA_UNIT_Pt);
17 } 17 }
18 18
19 FX_FLOAT CXFA_Font::GetHorizontalScale() { 19 FX_FLOAT CXFA_Font::GetHorizontalScale() {
20 CFX_WideString wsValue; 20 CFX_WideString wsValue;
21 m_pNode->TryCData(XFA_ATTRIBUTE_FontHorizontalScale, wsValue); 21 m_pNode->TryCData(XFA_ATTRIBUTE_FontHorizontalScale, wsValue);
22 int32_t iScale = FXSYS_wtoi((const FX_WCHAR*)wsValue); 22 int32_t iScale = FXSYS_wtoi(wsValue.c_str());
23 return iScale > 0 ? (FX_FLOAT)iScale : 100.0f; 23 return iScale > 0 ? (FX_FLOAT)iScale : 100.0f;
24 } 24 }
25 25
26 FX_FLOAT CXFA_Font::GetVerticalScale() { 26 FX_FLOAT CXFA_Font::GetVerticalScale() {
27 CFX_WideString wsValue; 27 CFX_WideString wsValue;
28 m_pNode->TryCData(XFA_ATTRIBUTE_FontVerticalScale, wsValue); 28 m_pNode->TryCData(XFA_ATTRIBUTE_FontVerticalScale, wsValue);
29 int32_t iScale = FXSYS_wtoi((const FX_WCHAR*)wsValue); 29 int32_t iScale = FXSYS_wtoi(wsValue.c_str());
30 return iScale > 0 ? (FX_FLOAT)iScale : 100.0f; 30 return iScale > 0 ? (FX_FLOAT)iScale : 100.0f;
31 } 31 }
32 32
33 FX_FLOAT CXFA_Font::GetLetterSpacing() { 33 FX_FLOAT CXFA_Font::GetLetterSpacing() {
34 CFX_WideStringC wsValue; 34 CFX_WideStringC wsValue;
35 if (!m_pNode->TryCData(XFA_ATTRIBUTE_LetterSpacing, wsValue)) 35 if (!m_pNode->TryCData(XFA_ATTRIBUTE_LetterSpacing, wsValue))
36 return 0; 36 return 0;
37 37
38 CXFA_Measurement ms(wsValue); 38 CXFA_Measurement ms(wsValue);
39 if (ms.GetUnit() == XFA_UNIT_Em) 39 if (ms.GetUnit() == XFA_UNIT_Em)
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 83
84 void CXFA_Font::SetColor(FX_ARGB color) { 84 void CXFA_Font::SetColor(FX_ARGB color) {
85 CXFA_Fill fill(m_pNode->GetProperty(0, XFA_ELEMENT_Fill)); 85 CXFA_Fill fill(m_pNode->GetProperty(0, XFA_ELEMENT_Fill));
86 fill.SetColor(color); 86 fill.SetColor(color);
87 } 87 }
88 88
89 FX_ARGB CXFA_Font::GetColor() { 89 FX_ARGB CXFA_Font::GetColor() {
90 CXFA_Fill fill(m_pNode->GetChild(0, XFA_ELEMENT_Fill)); 90 CXFA_Fill fill(m_pNode->GetChild(0, XFA_ELEMENT_Fill));
91 return fill ? fill.GetColor(TRUE) : 0xFF000000; 91 return fill ? fill.GetColor(TRUE) : 0xFF000000;
92 } 92 }
OLDNEW
« no previous file with comments | « xfa/fxfa/fm2js/xfa_fmparse.cpp ('k') | xfa/fxfa/parser/cxfa_widgetdata.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698