Fix and enable lint checks.

xfa/src/fgas/src/layout/fx_rtfbreak.cpp

Index: xfa/src/fgas/src/layout/fx_rtfbreak.cpp
diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp
index 4b17615e0758eec9fe61268c2b6434897c65f2b0..56e3b12b5bc839ae8fbaf3df356f2d4898ccaa03 100644
--- a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp
+++ b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp
@@ -531,11 +531,12 @@ FX_DWORD CFX_RTFBreak::AppendChar_Arabic(CFX_RTFChar* pCurChar,
       if (m_bVertical != FX_IsOdd(iLastRotation)) {
         iCharWidth = 1000;
       } else {
-        if (!m_pFont->GetCharWidth(wForm, iCharWidth, m_bCharCode))
+        if (!m_pFont->GetCharWidth(wForm, iCharWidth, m_bCharCode)) {
           if (!m_pFont->GetCharWidth(pLastChar->m_wCharCode, iCharWidth,
                                      m_bCharCode)) {
             iCharWidth = m_iDefChar;
           }
+        }
       }
       iCharWidth *= m_iFontSize;
       iCharWidth = iCharWidth * m_iHorizontalScale / 100;
@@ -549,11 +550,12 @@ FX_DWORD CFX_RTFBreak::AppendChar_Arabic(CFX_RTFChar* pCurChar,
   if (m_bVertical != FX_IsOdd(iRotation)) {
     iCharWidth = 1000;
   } else {

[Tom Sepez, 2016/03/01 17:38:06]

else if

[dsinclair, 2016/03/01 18:11:52]

Done. Also combined with the inner if().

-    if (!m_pFont->GetCharWidth(wForm, iCharWidth, m_bCharCode))
+    if (!m_pFont->GetCharWidth(wForm, iCharWidth, m_bCharCode)) {
       if (!m_pFont->GetCharWidth(pCurChar->m_wCharCode, iCharWidth,
                                  m_bCharCode)) {
         iCharWidth = m_iDefChar;
       }
+    }
   }
   iCharWidth *= m_iFontSize;
   iCharWidth = iCharWidth * m_iHorizontalScale / 100;