xfa/fgas/font/fgas_gefont.cpp - Issue 1862953004: Make CFX_WideString::FromLocal() take a CFX_ByteStringC arg

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: xfa/fgas/font/fgas_gefont.cpp

Issue 1862953004: Make CFX_WideString::FromLocal() take a CFX_ByteStringC arg (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Use GetConstStringBy(). 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 side-by-side diff with in-line comments

Download patch

Index: xfa/fgas/font/fgas_gefont.cpp

diff --git a/xfa/fgas/font/fgas_gefont.cpp b/xfa/fgas/font/fgas_gefont.cpp

index 3d740ba43a0639bdb4e8d9d8f955fe3c1f778c99..8652c742fc77c5f02eeadbf320c8fe0508fbbcd0 100644

--- a/xfa/fgas/font/fgas_gefont.cpp

+++ b/xfa/fgas/font/fgas_gefont.cpp

@@ -347,9 +347,11 @@ uint8_t CFX_GEFont::GetCharSet() const {

void CFX_GEFont::GetFamilyName(CFX_WideString& wsFamily) const {

if (!m_pFont->GetSubstFont() ||

m_pFont->GetSubstFont()->m_Family.GetLength() == 0) {

- wsFamily = CFX_WideString::FromLocal(m_pFont->GetFamilyName());

+ wsFamily =

+ CFX_WideString::FromLocal(m_pFont->GetFamilyName().AsByteStringC());

} else {

- wsFamily = CFX_WideString::FromLocal(m_pFont->GetSubstFont()->m_Family);

+ wsFamily = CFX_WideString::FromLocal(

+ m_pFont->GetSubstFont()->m_Family.AsByteStringC());

}

void CFX_GEFont::GetPsName(CFX_WideString& wsName) const {

« no previous file with comments | « fpdfsdk/javascript/PublicMethods.cpp ('k') | xfa/fxbarcode/BC_UtilCodingConvert.cpp » ('j') | no next file with comments »