From ca3ac5e9ffc936066267fbb1c329e5297d8e23e6 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 10 Jun 2015 17:38:11 -0700 Subject: Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs. Nearly automatic merge + re-run script on new files. Original Review URL: https://codereview.chromium.org/1180593004. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1174303002. --- core/src/fxge/ge/fx_ge_fontmap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/src/fxge/ge/fx_ge_fontmap.cpp') diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index 620b82953c..dbf9768148 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -1395,7 +1395,7 @@ CFX_FolderFontInfo::~CFX_FolderFontInfo() delete (CFontFaceInfo*)value; } } -void CFX_FolderFontInfo::AddPath(FX_BSTR path) +void CFX_FolderFontInfo::AddPath(const CFX_ByteStringC& path) { m_PathList.Add(path); } -- cgit v1.2.3