From ea5c4d3929928b318b339231804580d93a6e5f21 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 2 Oct 2015 12:28:32 -0700 Subject: 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 . --- xfa/src/fgas/src/font/fx_gefont.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'xfa/src') 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(); } -- cgit v1.2.3