| Index: fpdfsdk/pdfwindow/PWL_FontMap.cpp
|
| diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
|
| index 96acb78ec2aa0538730af46e8dfd5d3701152b7e..992d0c001997f2ce31c11eff5c06f4777820e16d 100644
|
| --- a/fpdfsdk/pdfwindow/PWL_FontMap.cpp
|
| +++ b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
|
| @@ -43,10 +43,6 @@ CPWL_FontMap::~CPWL_FontMap() {
|
| Empty();
|
| }
|
|
|
| -void CPWL_FontMap::SetSystemHandler(CFX_SystemHandler* pSystemHandler) {
|
| - m_pSystemHandler = pSystemHandler;
|
| -}
|
| -
|
| CPDF_Document* CPWL_FontMap::GetDocument() {
|
| if (!m_pPDFDoc) {
|
| if (CPDF_ModuleMgr::Get()) {
|
| @@ -276,12 +272,10 @@ CFX_ByteString CPWL_FontMap::GetNativeFont(int32_t nCharset) {
|
| nCharset = GetNativeCharset();
|
|
|
| CFX_ByteString sFontName = GetDefaultFontByCharset(nCharset);
|
| - if (m_pSystemHandler) {
|
| - if (m_pSystemHandler->FindNativeTrueTypeFont(sFontName))
|
| - return sFontName;
|
| + if (m_pSystemHandler->FindNativeTrueTypeFont(sFontName))
|
| + return sFontName;
|
|
|
| - sFontName.clear();
|
| - }
|
| + sFontName.clear();
|
| return sFontName;
|
| }
|
|
|
| @@ -322,11 +316,8 @@ CPDF_Font* CPWL_FontMap::AddSystemFont(CPDF_Document* pDoc,
|
| if (nCharset == DEFAULT_CHARSET)
|
| nCharset = GetNativeCharset();
|
|
|
| - if (m_pSystemHandler)
|
| - return m_pSystemHandler->AddNativeTrueTypeFontToPDF(pDoc, sFontName,
|
| - nCharset);
|
| -
|
| - return nullptr;
|
| + return m_pSystemHandler->AddNativeTrueTypeFontToPDF(pDoc, sFontName,
|
| + nCharset);
|
| }
|
|
|
| CFX_ByteString CPWL_FontMap::EncodeFontAlias(const CFX_ByteString& sFontName,
|
| @@ -484,13 +475,3 @@ int32_t CPWL_FontMap::CharSetFromUnicode(uint16_t word, int32_t nOldCharset) {
|
|
|
| return ANSI_CHARSET;
|
| }
|
| -
|
| -CPWL_DocFontMap::CPWL_DocFontMap(CFX_SystemHandler* pSystemHandler,
|
| - CPDF_Document* pAttachedDoc)
|
| - : CPWL_FontMap(pSystemHandler), m_pAttachedDoc(pAttachedDoc) {}
|
| -
|
| -CPWL_DocFontMap::~CPWL_DocFontMap() {}
|
| -
|
| -CPDF_Document* CPWL_DocFontMap::GetDocument() {
|
| - return m_pAttachedDoc;
|
| -}
|
|
|