| Index: core/fxge/ge/cfx_folderfontinfo.h
|
| diff --git a/core/fxge/ge/cfx_folderfontinfo.h b/core/fxge/ge/cfx_folderfontinfo.h
|
| index ef4645cf53865660f5b9889cab8b0aaa8b0d13eb..d031eef3d06a79e0843f9804c18989fe0f59c640 100644
|
| --- a/core/fxge/ge/cfx_folderfontinfo.h
|
| +++ b/core/fxge/ge/cfx_folderfontinfo.h
|
| @@ -22,9 +22,9 @@ class CFX_FolderFontInfo : public IFX_SystemFontInfo {
|
| void AddPath(const CFX_ByteStringC& path);
|
|
|
| // IFX_SytemFontInfo:
|
| - FX_BOOL EnumFontList(CFX_FontMapper* pMapper) override;
|
| + bool EnumFontList(CFX_FontMapper* pMapper) override;
|
| void* MapFont(int weight,
|
| - FX_BOOL bItalic,
|
| + bool bItalic,
|
| int charset,
|
| int pitch_family,
|
| const FX_CHAR* face,
|
| @@ -32,7 +32,7 @@ class CFX_FolderFontInfo : public IFX_SystemFontInfo {
|
| #ifdef PDF_ENABLE_XFA
|
| void* MapFontByUnicode(uint32_t dwUnicode,
|
| int weight,
|
| - FX_BOOL bItalic,
|
| + bool bItalic,
|
| int pitch_family) override;
|
| #endif // PDF_ENABLE_XFA
|
| void* GetFont(const FX_CHAR* face) override;
|
| @@ -41,8 +41,8 @@ class CFX_FolderFontInfo : public IFX_SystemFontInfo {
|
| uint8_t* buffer,
|
| uint32_t size) override;
|
| void DeleteFont(void* hFont) override;
|
| - FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) override;
|
| - FX_BOOL GetFontCharset(void* hFont, int& charset) override;
|
| + bool GetFaceName(void* hFont, CFX_ByteString& name) override;
|
| + bool GetFontCharset(void* hFont, int& charset) override;
|
|
|
| protected:
|
| void ScanPath(const CFX_ByteString& path);
|
| @@ -53,11 +53,11 @@ class CFX_FolderFontInfo : public IFX_SystemFontInfo {
|
| uint32_t offset);
|
| void* GetSubstFont(const CFX_ByteString& face);
|
| void* FindFont(int weight,
|
| - FX_BOOL bItalic,
|
| + bool bItalic,
|
| int charset,
|
| int pitch_family,
|
| const FX_CHAR* family,
|
| - FX_BOOL bMatchName);
|
| + bool bMatchName);
|
|
|
| std::map<CFX_ByteString, CFX_FontFaceInfo*> m_FontList;
|
| std::vector<CFX_ByteString> m_PathList;
|
|
|