| Index: core/fxge/ge/cfx_folderfontinfo.cpp
|
| diff --git a/core/fxge/ge/cfx_folderfontinfo.cpp b/core/fxge/ge/cfx_folderfontinfo.cpp
|
| index 393f74bbd9594c0d3add7c55f22ea4c2efbe0c56..9ccccbc6356474602ab6642208dcdb2b2799a8bd 100644
|
| --- a/core/fxge/ge/cfx_folderfontinfo.cpp
|
| +++ b/core/fxge/ge/cfx_folderfontinfo.cpp
|
| @@ -76,7 +76,7 @@ uint32_t GetCharset(int charset) {
|
| }
|
|
|
| int32_t GetSimilarValue(int weight,
|
| - FX_BOOL bItalic,
|
| + bool bItalic,
|
| int pitch_family,
|
| uint32_t style) {
|
| int32_t iSimilarValue = 0;
|
| @@ -108,11 +108,11 @@ void CFX_FolderFontInfo::AddPath(const CFX_ByteStringC& path) {
|
| m_PathList.push_back(CFX_ByteString(path));
|
| }
|
|
|
| -FX_BOOL CFX_FolderFontInfo::EnumFontList(CFX_FontMapper* pMapper) {
|
| +bool CFX_FolderFontInfo::EnumFontList(CFX_FontMapper* pMapper) {
|
| m_pMapper = pMapper;
|
| for (const auto& path : m_PathList)
|
| ScanPath(path);
|
| - return TRUE;
|
| + return true;
|
| }
|
|
|
| void CFX_FolderFontInfo::ScanPath(const CFX_ByteString& path) {
|
| @@ -270,11 +270,11 @@ void* CFX_FolderFontInfo::GetSubstFont(const CFX_ByteString& face) {
|
| }
|
|
|
| void* CFX_FolderFontInfo::FindFont(int weight,
|
| - FX_BOOL bItalic,
|
| + bool bItalic,
|
| int charset,
|
| int pitch_family,
|
| const FX_CHAR* family,
|
| - FX_BOOL bMatchName) {
|
| + bool bMatchName) {
|
| CFX_FontFaceInfo* pFind = nullptr;
|
| if (charset == FXFONT_ANSI_CHARSET && (pitch_family & FXFONT_FF_FIXEDPITCH))
|
| return GetFont("Courier New");
|
| @@ -301,7 +301,7 @@ void* CFX_FolderFontInfo::FindFont(int weight,
|
| }
|
|
|
| void* CFX_FolderFontInfo::MapFont(int weight,
|
| - FX_BOOL bItalic,
|
| + bool bItalic,
|
| int charset,
|
| int pitch_family,
|
| const FX_CHAR* family,
|
| @@ -312,7 +312,7 @@ void* CFX_FolderFontInfo::MapFont(int weight,
|
| #ifdef PDF_ENABLE_XFA
|
| void* CFX_FolderFontInfo::MapFontByUnicode(uint32_t dwUnicode,
|
| int weight,
|
| - FX_BOOL bItalic,
|
| + bool bItalic,
|
| int pitch_family) {
|
| return nullptr;
|
| }
|
| @@ -364,14 +364,14 @@ uint32_t CFX_FolderFontInfo::GetFontData(void* hFont,
|
| }
|
|
|
| void CFX_FolderFontInfo::DeleteFont(void* hFont) {}
|
| -FX_BOOL CFX_FolderFontInfo::GetFaceName(void* hFont, CFX_ByteString& name) {
|
| +bool CFX_FolderFontInfo::GetFaceName(void* hFont, CFX_ByteString& name) {
|
| if (!hFont)
|
| - return FALSE;
|
| + return false;
|
| CFX_FontFaceInfo* pFont = (CFX_FontFaceInfo*)hFont;
|
| name = pFont->m_FaceName;
|
| - return TRUE;
|
| + return true;
|
| }
|
|
|
| -FX_BOOL CFX_FolderFontInfo::GetFontCharset(void* hFont, int& charset) {
|
| - return FALSE;
|
| +bool CFX_FolderFontInfo::GetFontCharset(void* hFont, int& charset) {
|
| + return false;
|
| }
|
|
|