core/src/fpdfdoc/doc_form.cpp - Issue 1105253002: Merge to XFA: Fix windows-specific usage of CFX_WideStr::operator LPCWSTR().

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: core/src/fpdfdoc/doc_form.cpp

Issue 1105253002: Merge to XFA: Fix windows-specific usage of CFX_WideStr::operator LPCWSTR(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 5 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: core/src/fpdfdoc/doc_form.cpp

diff --git a/core/src/fpdfdoc/doc_form.cpp b/core/src/fpdfdoc/doc_form.cpp

index bb2c3a130160e8c9fd4a10251383085aa9787a62..87887d73302006aaaabf380f63cb4baacdc7c43d 100644

--- a/core/src/fpdfdoc/doc_form.cpp

+++ b/core/src/fpdfdoc/doc_form.cpp

@@ -468,7 +468,7 @@ CPDF_Font* CPDF_InterForm::AddSystemFont(const CPDF_Document* pDocument, CFX_Wid

if (iCharSet == 1) {

iCharSet = GetNativeCharSet();

}

- HFONT hFont = ::CreateFontW(0, 0, 0, 0, 0, 0, 0, 0, iCharSet, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, csFontName);

+ HFONT hFont = ::CreateFontW(0, 0, 0, 0, 0, 0, 0, 0, iCharSet, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, csFontName.c_str());

if (hFont != NULL) {

LOGFONTA lf;

memset(&lf, 0, sizeof(LOGFONTA));

« no previous file with comments | « core/include/fxge/fx_ge_win32.h ('k') | core/src/fxcrt/fx_basic_util.cpp » ('j') | no next file with comments »