| Index: fpdfsdk/formfiller/cba_fontmap.cpp
|
| diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp
|
| index 9102b7bf9a1ad23d2bf0b1bbc1272646feb0f5e4..b8c8865d44c83d0e3e4660d41b1694521babe73a 100644
|
| --- a/fpdfsdk/formfiller/cba_fontmap.cpp
|
| +++ b/fpdfsdk/formfiller/cba_fontmap.cpp
|
| @@ -79,24 +79,23 @@ void CBA_FontMap::SetDefaultFont(CPDF_Font* pFont,
|
|
|
| CPDF_Font* CBA_FontMap::FindFontSameCharset(CFX_ByteString& sFontAlias,
|
| int32_t nCharset) {
|
| - if (m_pAnnotDict->GetStringBy("Subtype") == "Widget") {
|
| - CPDF_Document* pDocument = GetDocument();
|
| - CPDF_Dictionary* pRootDict = pDocument->GetRoot();
|
| - if (!pRootDict)
|
| - return nullptr;
|
| + if (m_pAnnotDict->GetStringBy("Subtype") != "Widget")
|
| + return nullptr;
|
|
|
| - CPDF_Dictionary* pAcroFormDict = pRootDict->GetDictBy("AcroForm");
|
| - if (!pAcroFormDict)
|
| - return nullptr;
|
| + CPDF_Document* pDocument = GetDocument();
|
| + CPDF_Dictionary* pRootDict = pDocument->GetRoot();
|
| + if (!pRootDict)
|
| + return nullptr;
|
|
|
| - CPDF_Dictionary* pDRDict = pAcroFormDict->GetDictBy("DR");
|
| - if (!pDRDict)
|
| - return nullptr;
|
| + CPDF_Dictionary* pAcroFormDict = pRootDict->GetDictBy("AcroForm");
|
| + if (!pAcroFormDict)
|
| + return nullptr;
|
|
|
| - return FindResFontSameCharset(pDRDict, sFontAlias, nCharset);
|
| - }
|
| + CPDF_Dictionary* pDRDict = pAcroFormDict->GetDictBy("DR");
|
| + if (!pDRDict)
|
| + return nullptr;
|
|
|
| - return nullptr;
|
| + return FindResFontSameCharset(pDRDict, sFontAlias, nCharset);
|
| }
|
|
|
| CPDF_Document* CBA_FontMap::GetDocument() {
|
|
|