Fix some misc nits.

fpdfsdk/fsdk_baseform.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 "fpdfsdk/include/fsdk_baseform.h"
 
 #include <algorithm>
 #include <map>
@@ skipping 1416 matching lines @@
   CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
   CPDFDoc_Environment* pEnv = pDoc->GetEnv();
 
   CBA_FontMap font_map(this, pEnv->GetSysHandler());
   pEdit->SetFontMap(&font_map);
 
   pEdit->SetPlateRect(CFX_FloatRect(rcClient.left, 0.0f, rcClient.right, 0.0f));
 
   FX_FLOAT fFontSize = GetFontSize();
 
-  if (IsFloatZero(fFontSize))
-    pEdit->SetFontSize(12.0f);
-  else
-    pEdit->SetFontSize(fFontSize);
+  pEdit->SetFontSize(IsFloatZero(fFontSize) ? 12.0f : fFontSize);
 
   pEdit->Initialize();
 
   CFX_ByteTextBuf sList;
   FX_FLOAT fy = rcClient.top;
 
   int32_t nTop = pField->GetTopVisibleIndex();
   int32_t nCount = pField->CountOptions();
   int32_t nSelCount = pField->CountSelectedItems();
 
-  for (int32_t i = nTop; i < nCount; i++) {
-    FX_BOOL bSelected = FALSE;
-    for (int32_t j = 0; j < nSelCount; j++) {
+  for (int32_t i = nTop; i < nCount; ++i) {
+    bool bSelected = false;
+    for (int32_t j = 0; j < nSelCount; ++j) {
       if (pField->GetSelectedIndex(j) == i) {
-        bSelected = TRUE;
+        bSelected = true;
         break;
       }
     }
 
     pEdit->SetText(pField->GetOptionLabel(i).c_str());
 
     CFX_FloatRect rcContent = pEdit->GetContentRect();
     FX_FLOAT fItemHeight = rcContent.Height();
 
     if (bSelected) {
@@ skipping 136 matching lines @@
     switch (GetBorderStyle()) {
       case BBS_SOLID: {
         CFX_ByteString sColor =
             CPWL_Utils::GetColorAppStream(GetBorderPWLColor(), FALSE);
         if (sColor.GetLength() > 0) {
           sLines << "q\n"
                  << GetBorderWidth() << " w\n"
                  << CPWL_Utils::GetColorAppStream(GetBorderPWLColor(), FALSE)
                  << " 2 J 0 j\n";
 
-          for (int32_t i = 1; i < nMaxLen; i++) {
+          for (int32_t i = 1; i < nMaxLen; ++i) {
             sLines << rcClient.left +
                           ((rcClient.right - rcClient.left) / nMaxLen) * i
                    << " " << rcClient.bottom << " m\n"
                    << rcClient.left +
                           ((rcClient.right - rcClient.left) / nMaxLen) * i
                    << " " << rcClient.top << " l S\n";
           }
 
           sLines << "Q\n";
         }
       } break;
       case BBS_DASH: {
         CFX_ByteString sColor =
             CPWL_Utils::GetColorAppStream(GetBorderPWLColor(), FALSE);
         if (sColor.GetLength() > 0) {
           CPWL_Dash dsBorder = CPWL_Dash(3, 3, 0);
 
           sLines << "q\n"
                  << GetBorderWidth() << " w\n"
                  << CPWL_Utils::GetColorAppStream(GetBorderPWLColor(), FALSE)
                  << "[" << dsBorder.nDash << " " << dsBorder.nGap << "] "
                  << dsBorder.nPhase << " d\n";
 
-          for (int32_t i = 1; i < nMaxLen; i++) {
+          for (int32_t i = 1; i < nMaxLen; ++i) {
             sLines << rcClient.left +
                           ((rcClient.right - rcClient.left) / nMaxLen) * i
                    << " " << rcClient.bottom << " m\n"
                    << rcClient.left +
                           ((rcClient.right - rcClient.left) / nMaxLen) * i
                    << " " << rcClient.top << " l S\n";
           }
 
           sLines << "Q\n";
         }
@@ skipping 1175 matching lines @@
       break;
     }
   }
 }
 
 CFX_FloatRect CBA_AnnotIterator::GetAnnotRect(const CPDFSDK_Annot* pAnnot) {
   CFX_FloatRect rcAnnot;
   pAnnot->GetPDFAnnot()->GetRect(rcAnnot);
   return rcAnnot;
 }