Fix two bugs found by /analyze tool

xfa/fwl/theme/cfwl_checkboxtp.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/theme/cfwl_checkboxtp.h"
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/basewidget/ifwl_checkbox.h"
@@ skipping 148 matching lines @@
                    m_pThemeData->clrBoxBk[iTheme][1], &path, fillMode, pMatrix);
 }
 void CFWL_CheckBoxTP::DrawSign(IFWL_Widget* pWidget,
                                CFX_Graphics* pGraphics,
                                const CFX_RectF* pRtBox,
                                uint32_t dwStates,
                                CFX_Matrix* pMatrix) {
   CFX_RectF rtSign(*pRtBox);
   rtSign.Deflate(kSignMargin, kSignMargin);
   uint32_t dwColor = m_pThemeData->clrSignCheck;
-  FX_BOOL bCheck = TRUE;
+  bool bCheck = true;
   if ((dwStates & CFWL_PartState_Disabled) &&
       (dwStates & CFWL_PartState_Checked)) {
     dwColor = m_pThemeData->clrSignBorderDisable;
   } else if (dwStates & CFWL_PartState_Neutral) {
-    if (dwStates & CFWL_PartState_Normal) {
-      bCheck = FALSE;
-      dwColor = m_pThemeData->clrSignNeutralNormal;
-    } else if (dwStates & CFWL_PartState_Hovered) {
-      bCheck = FALSE;
+    if (dwStates & CFWL_PartState_Hovered) {
       dwColor = m_pThemeData->clrSignNeutralHover;
     } else if (dwStates & CFWL_PartState_Pressed) {
-      bCheck = FALSE, dwColor = m_pThemeData->clrSignNeutralPressed;
+      dwColor = m_pThemeData->clrSignNeutralPressed;
     } else if (dwStates & CFWL_PartState_Disabled) {
-      bCheck = FALSE, dwColor = m_pThemeData->clrSignBorderDisable;
+      dwColor = m_pThemeData->clrSignBorderDisable;
+    } else {
+      dwColor = m_pThemeData->clrSignNeutralNormal;
     }
+    bCheck = false;
   }
   if (bCheck) {
     uint32_t dwStyle = pWidget->GetStylesEx();
     switch (dwStyle & FWL_STYLEEXT_CKB_SignShapeMask) {
       case FWL_STYLEEXT_CKB_SignShapeCheck: {
         DrawSignCheck(pGraphics, &rtSign, dwColor, pMatrix);
         break;
       }
       case FWL_STYLEEXT_CKB_SignShapeCircle: {
         rtSign.Deflate(1, 1);
@@ skipping 302 matching lines @@
                            pt1.x + px2 * FX_BEZIER, pt1.y + py2 * FX_BEZIER,
                            pt1.x, pt1.y);
     FX_FLOAT fScale = fCheckLen / kSignPath;
     CFX_Matrix mt;
     mt.Set(1, 0, 0, 1, 0, 0);
     mt.Scale(fScale, fScale);
     CFX_PathData* pData = m_pCheckPath->GetPathData();
     pData->Transform(&mt);
   }
 }