diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-02 12:28:32 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-02 12:28:32 -0700 |
| commit | ea5c4d3929928b318b339231804580d93a6e5f21 (patch) | |
| tree | e4716d176a1326e823ff075ffad74e1236206de0 /xfa/src/fgas/src/font/fx_gefont.cpp | |
| parent | 9e75b82d5d18f748b260202fed5a59682631475c (diff) | |
| download | pdfium-ea5c4d3929928b318b339231804580d93a6e5f21.tar.xz | |
Merge to XFA: Turn a couple functions that always return true to return void.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1386463003 .
(cherry picked from commit dcfa0ba2928072c962fe8835d1a2ccd309eafbbd)
Review URL: https://codereview.chromium.org/1379093003 .
Diffstat (limited to 'xfa/src/fgas/src/font/fx_gefont.cpp')
| -rw-r--r-- | xfa/src/fgas/src/font/fx_gefont.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xfa/src/fgas/src/font/fx_gefont.cpp b/xfa/src/fgas/src/font/fx_gefont.cpp index 0da6720e2c..12c4f0ea39 100644 --- a/xfa/src/fgas/src/font/fx_gefont.cpp +++ b/xfa/src/fgas/src/font/fx_gefont.cpp @@ -235,9 +235,8 @@ FX_BOOL CFX_GEFont::LoadFont(const FX_WCHAR* pszFontFamily, } else if (dwFlags & FXFONT_ITALIC) {
csFontFamily += ",Italic";
}
- FX_BOOL bRet =
- m_pFont->LoadSubst(csFontFamily, TRUE, dwFlags, iWeight, 0, wCodePage);
- bRet = m_pFont->m_Face != NULL;
+ m_pFont->LoadSubst(csFontFamily, TRUE, dwFlags, iWeight, 0, wCodePage);
+ FX_BOOL bRet = m_pFont->m_Face != nullptr;
if (bRet) {
InitFont();
}
|