| Index: xfa/fgas/font/fgas_font.h
|
| diff --git a/xfa/fgas/font/fgas_font.h b/xfa/fgas/font/fgas_font.h
|
| index 5d3a44092da52b5d2639003312951e3f31545f6d..e6f6880628c86a840348e388903052d64821eb40 100644
|
| --- a/xfa/fgas/font/fgas_font.h
|
| +++ b/xfa/fgas/font/fgas_font.h
|
| @@ -153,26 +153,26 @@ class IFGAS_FontMgr {
|
| virtual IFGAS_Font* GetDefFontByCodePage(
|
| uint16_t wCodePage,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) = 0;
|
| + const FX_WCHAR* pszFontFamily = nullptr) = 0;
|
| virtual IFGAS_Font* GetDefFontByCharset(
|
| uint8_t nCharset,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) = 0;
|
| + const FX_WCHAR* pszFontFamily = nullptr) = 0;
|
| virtual IFGAS_Font* GetDefFontByUnicode(
|
| FX_WCHAR wUnicode,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) = 0;
|
| + const FX_WCHAR* pszFontFamily = nullptr) = 0;
|
| virtual IFGAS_Font* GetDefFontByLanguage(
|
| uint16_t wLanguage,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) = 0;
|
| + const FX_WCHAR* pszFontFamily = nullptr) = 0;
|
| virtual IFGAS_Font* LoadFont(const FX_WCHAR* pszFontFamily,
|
| uint32_t dwFontStyles,
|
| uint16_t wCodePage = 0xFFFF) = 0;
|
| virtual IFGAS_Font* LoadFont(const uint8_t* pBuffer, int32_t iLength) = 0;
|
| virtual IFGAS_Font* LoadFont(const FX_WCHAR* pszFileName) = 0;
|
| virtual IFGAS_Font* LoadFont(IFX_Stream* pFontStream,
|
| - const FX_WCHAR* pszFontAlias = NULL,
|
| + const FX_WCHAR* pszFontAlias = nullptr,
|
| uint32_t dwFontStyles = 0,
|
| uint16_t wCodePage = 0,
|
| FX_BOOL bSaveStream = FALSE) = 0;
|
| @@ -193,23 +193,23 @@ class IFGAS_FontMgr {
|
| virtual IFGAS_Font* GetDefFontByCodePage(
|
| uint16_t wCodePage,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) = 0;
|
| + const FX_WCHAR* pszFontFamily = nullptr) = 0;
|
| virtual IFGAS_Font* GetDefFontByCharset(
|
| uint8_t nCharset,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) = 0;
|
| + const FX_WCHAR* pszFontFamily = nullptr) = 0;
|
| virtual IFGAS_Font* GetDefFontByUnicode(
|
| FX_WCHAR wUnicode,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) = 0;
|
| + const FX_WCHAR* pszFontFamily = nullptr) = 0;
|
| virtual IFGAS_Font* GetDefFontByLanguage(
|
| uint16_t wLanguage,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) = 0;
|
| + const FX_WCHAR* pszFontFamily = nullptr) = 0;
|
| virtual IFGAS_Font* GetFontByCodePage(
|
| uint16_t wCodePage,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) = 0;
|
| + const FX_WCHAR* pszFontFamily = nullptr) = 0;
|
| inline IFGAS_Font* LoadFont(const FX_WCHAR* pszFontFamily,
|
| uint32_t dwFontStyles,
|
| uint16_t wCodePage) {
|
| @@ -218,25 +218,25 @@ class IFGAS_FontMgr {
|
| virtual IFGAS_Font* GetFontByCharset(
|
| uint8_t nCharset,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) = 0;
|
| + const FX_WCHAR* pszFontFamily = nullptr) = 0;
|
| virtual IFGAS_Font* GetFontByUnicode(
|
| FX_WCHAR wUnicode,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) = 0;
|
| + const FX_WCHAR* pszFontFamily = nullptr) = 0;
|
| virtual IFGAS_Font* GetFontByLanguage(
|
| uint16_t wLanguage,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) = 0;
|
| + const FX_WCHAR* pszFontFamily = nullptr) = 0;
|
| virtual IFGAS_Font* LoadFont(const uint8_t* pBuffer,
|
| int32_t iLength,
|
| int32_t iFaceIndex,
|
| - int32_t* pFaceCount = NULL) = 0;
|
| + int32_t* pFaceCount = nullptr) = 0;
|
| virtual IFGAS_Font* LoadFont(const FX_WCHAR* pszFileName,
|
| int32_t iFaceIndex,
|
| - int32_t* pFaceCount = NULL) = 0;
|
| + int32_t* pFaceCount = nullptr) = 0;
|
| virtual IFGAS_Font* LoadFont(IFX_Stream* pFontStream,
|
| int32_t iFaceIndex,
|
| - int32_t* pFaceCount = NULL,
|
| + int32_t* pFaceCount = nullptr,
|
| FX_BOOL bSaveStream = FALSE) = 0;
|
|
|
| virtual void ClearFontCache() = 0;
|
|
|