| Index: xfa/fgas/font/fgas_stdfontmgr.h
|
| diff --git a/xfa/fgas/font/fgas_stdfontmgr.h b/xfa/fgas/font/fgas_stdfontmgr.h
|
| index 2aea2078aa4e2cda7537c510f8c57e0682b1d05f..ae1b05a0fcbbc114981a36f591dfc1c55d49b318 100644
|
| --- a/xfa/fgas/font/fgas_stdfontmgr.h
|
| +++ b/xfa/fgas/font/fgas_stdfontmgr.h
|
| @@ -28,26 +28,26 @@ class CFGAS_StdFontMgrImp : public IFGAS_FontMgr {
|
| IFGAS_Font* GetDefFontByCodePage(
|
| uint16_t wCodePage,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) override;
|
| + const FX_WCHAR* pszFontFamily = nullptr) override;
|
| IFGAS_Font* GetDefFontByCharset(
|
| uint8_t nCharset,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) override;
|
| + const FX_WCHAR* pszFontFamily = nullptr) override;
|
| IFGAS_Font* GetDefFontByUnicode(
|
| FX_WCHAR wUnicode,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) override;
|
| + const FX_WCHAR* pszFontFamily = nullptr) override;
|
| IFGAS_Font* GetDefFontByLanguage(
|
| uint16_t wLanguage,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) override;
|
| + const FX_WCHAR* pszFontFamily = nullptr) override;
|
| IFGAS_Font* LoadFont(const FX_WCHAR* pszFontFamily,
|
| uint32_t dwFontStyles,
|
| uint16_t wCodePage = 0xFFFF) override;
|
| IFGAS_Font* LoadFont(const uint8_t* pBuffer, int32_t iLength) override;
|
| IFGAS_Font* LoadFont(const FX_WCHAR* pszFileName) override;
|
| 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) override;
|
| @@ -86,15 +86,16 @@ uint32_t FX_GetGdiFontStyles(const LOGFONTW& lf);
|
| class CFX_FontDescriptor {
|
| public:
|
| CFX_FontDescriptor()
|
| - : m_pFileAccess(NULL), m_nFaceIndex(0), m_dwFontStyles(0) {
|
| + : m_pFileAccess(nullptr), m_nFaceIndex(0), m_dwFontStyles(0) {
|
| m_dwUsb[0] = m_dwUsb[1] = m_dwUsb[2] = m_dwUsb[3] = 0;
|
| m_dwCsb[0] = m_dwCsb[1] = 0;
|
| }
|
| +
|
| ~CFX_FontDescriptor() {
|
| - if (NULL != m_pFileAccess) {
|
| + if (m_pFileAccess)
|
| m_pFileAccess->Release();
|
| - }
|
| }
|
| +
|
| IFX_FileAccess* m_pFileAccess;
|
| int32_t m_nFaceIndex;
|
| CFX_WideString m_wsFaceName;
|
| @@ -158,31 +159,35 @@ class CFGAS_FontMgrImp : public IFGAS_FontMgr {
|
| IFGAS_Font* GetDefFontByCodePage(
|
| uint16_t wCodePage,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) override;
|
| + const FX_WCHAR* pszFontFamily = nullptr) override;
|
| IFGAS_Font* GetDefFontByCharset(
|
| uint8_t nCharset,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) override;
|
| + const FX_WCHAR* pszFontFamily = nullptr) override;
|
| IFGAS_Font* GetDefFontByUnicode(
|
| FX_WCHAR wUnicode,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) override;
|
| + const FX_WCHAR* pszFontFamily = nullptr) override;
|
| IFGAS_Font* GetDefFontByLanguage(
|
| uint16_t wLanguage,
|
| uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) override;
|
| - IFGAS_Font* GetFontByCodePage(uint16_t wCodePage,
|
| - uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) override;
|
| - IFGAS_Font* GetFontByCharset(uint8_t nCharset,
|
| - uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) override;
|
| - IFGAS_Font* GetFontByUnicode(FX_WCHAR wUnicode,
|
| - uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) override;
|
| - IFGAS_Font* GetFontByLanguage(uint16_t wLanguage,
|
| - uint32_t dwFontStyles,
|
| - const FX_WCHAR* pszFontFamily = NULL) override;
|
| + const FX_WCHAR* pszFontFamily = nullptr) override;
|
| + IFGAS_Font* GetFontByCodePage(
|
| + uint16_t wCodePage,
|
| + uint32_t dwFontStyles,
|
| + const FX_WCHAR* pszFontFamily = nullptr) override;
|
| + IFGAS_Font* GetFontByCharset(
|
| + uint8_t nCharset,
|
| + uint32_t dwFontStyles,
|
| + const FX_WCHAR* pszFontFamily = nullptr) override;
|
| + IFGAS_Font* GetFontByUnicode(
|
| + FX_WCHAR wUnicode,
|
| + uint32_t dwFontStyles,
|
| + const FX_WCHAR* pszFontFamily = nullptr) override;
|
| + IFGAS_Font* GetFontByLanguage(
|
| + uint16_t wLanguage,
|
| + uint32_t dwFontStyles,
|
| + const FX_WCHAR* pszFontFamily = nullptr) override;
|
| IFGAS_Font* LoadFont(const uint8_t* pBuffer,
|
| int32_t iLength,
|
| int32_t iFaceIndex,
|
|
|