Remove implicit conversions and some cleanup

core/src/fpdfdoc/doc_formcontrol.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 <algorithm>
 
 #include "core/include/fpdfdoc/fpdf_doc.h"
 
@@ skipping 228 matching lines @@
   }
   if (m_pWidgetDict->KeyExist("A")) {
     return CPDF_Action(m_pWidgetDict->GetDictBy("A"));
   }
   CPDF_Object* pObj = FPDF_GetFieldAttr(m_pField->m_pDict, "A");
   if (!pObj) {
     return CPDF_Action();
   }
   return CPDF_Action(pObj->GetDict());
 }
+
 CPDF_AAction CPDF_FormControl::GetAdditionalAction() {
-  if (!m_pWidgetDict) {
-    return nullptr;
+  CPDF_Dictionary* dict = nullptr;
+  if (m_pWidgetDict) {

[Tom Sepez, 2016/03/01 17:53:35]

Same thing here with no-arg ctor.

[Wei Li, 2016/03/01 21:46:53]

Done.

+    if (m_pWidgetDict->KeyExist("AA"))
+      dict = m_pWidgetDict->GetDictBy("AA");
+    else
+      dict = m_pField->GetAdditionalAction();
   }
-  if (m_pWidgetDict->KeyExist("AA")) {
-    return m_pWidgetDict->GetDictBy("AA");
+  return CPDF_AAction(dict);
+}
+
+CPDF_DefaultAppearance CPDF_FormControl::GetDefaultAppearance() {
+  CFX_ByteString str;
+  if (m_pWidgetDict) {
+    if (m_pWidgetDict->KeyExist("DA")) {
+      str = m_pWidgetDict->GetStringBy("DA");
+    } else {
+      CPDF_Object* pObj = FPDF_GetFieldAttr(m_pField->m_pDict, "DA");
+      str =
+          pObj ? pObj->GetString() : m_pField->m_pForm->GetDefaultAppearance();
+    }
   }
-  return m_pField->GetAdditionalAction();
-}
-CPDF_DefaultAppearance CPDF_FormControl::GetDefaultAppearance() {
-  if (!m_pWidgetDict) {
-    return CFX_ByteString();
-  }
-  if (m_pWidgetDict->KeyExist("DA")) {
-    return m_pWidgetDict->GetStringBy("DA");
-  }
-  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pField->m_pDict, "DA");
-  if (!pObj) {
-    return m_pField->m_pForm->GetDefaultAppearance();
-  }
-  return pObj->GetString();
+  return CPDF_DefaultAppearance(str);
 }
 
 CPDF_Font* CPDF_FormControl::GetDefaultControlFont() {
   CPDF_DefaultAppearance cDA = GetDefaultAppearance();
   CFX_ByteString csFontNameTag;
   FX_FLOAT fFontSize;
   cDA.GetFont(csFontNameTag, fFontSize);
   if (csFontNameTag.IsEmpty())
     return nullptr;
 
@@ skipping 134 matching lines @@
 CFX_WideString CPDF_ApSettings::GetCaption(
     const CFX_ByteStringC& csEntry) const {
   return m_pDict ? m_pDict->GetUnicodeTextBy(csEntry) : CFX_WideString();
 }
 
 CPDF_Stream* CPDF_ApSettings::GetIcon(const CFX_ByteStringC& csEntry) const {
   return m_pDict ? m_pDict->GetStreamBy(csEntry) : nullptr;
 }
 
 CPDF_IconFit CPDF_ApSettings::GetIconFit() const {
-  return m_pDict ? m_pDict->GetDictBy("IF") : nullptr;
+  return CPDF_IconFit(m_pDict ? m_pDict->GetDictBy("IF") : nullptr);
 }
 
 int CPDF_ApSettings::GetTextPosition() const {
   return m_pDict ? m_pDict->GetIntegerBy("TP", TEXTPOS_CAPTION)
                  : TEXTPOS_CAPTION;
 }