Merge to XFA: Use stdint.h types throughout PDFium.

fpdfsdk/src/formfiller/FFL_ComboBox.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 "../../include/formfiller/FormFiller.h"
 #include "../../include/formfiller/FFL_FormFiller.h"
 #include "../../include/formfiller/FFL_IFormFiller.h"
 #include "../../include/formfiller/FFL_CBA_Fontmap.h"
@@ skipping 62 matching lines @@
 
 CPWL_Wnd* CFFL_ComboBox::NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView* pPageView)
 {
         CPWL_ComboBox * pWnd = new CPWL_ComboBox();
         pWnd->AttachFFLData(this);
         pWnd->Create(cp);
 
         CFFL_IFormFiller* pFormFiller = m_pApp->GetIFormFiller();
         pWnd->SetFillerNotify(pFormFiller);
 
-        FX_INT32 nCurSel = m_pWidget->GetSelectedIndex(0);
+        int32_t nCurSel = m_pWidget->GetSelectedIndex(0);
         CFX_WideString swText;
         if (nCurSel < 0)
                 swText = m_pWidget->GetValue();
         else
                 swText = m_pWidget->GetOptionLabel(nCurSel);
 
-        for (FX_INT32 i=0,sz=m_pWidget->CountOptions(); i<sz; i++)
+        for (int32_t i=0,sz=m_pWidget->CountOptions(); i<sz; i++)
         {
                 pWnd->AddString(m_pWidget->GetOptionLabel(i).c_str());
         }
 
         pWnd->SetSelect(nCurSel);
         pWnd->SetText(swText.c_str());
         return pWnd;
 }
 
 
 FX_BOOL CFFL_ComboBox::OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags)
 {
         return CFFL_FormFiller::OnChar(pAnnot, nChar, nFlags);
 }
 
 FX_BOOL CFFL_ComboBox::IsDataChanged(CPDFSDK_PageView* pPageView)
 {
         if (CPWL_ComboBox * pWnd = (CPWL_ComboBox*)GetPDFWindow(pPageView, FALSE))
         {
-                FX_INT32 nCurSel = pWnd->GetSelect();
+                int32_t nCurSel = pWnd->GetSelect();
 
                 ASSERT(m_pWidget != NULL);
 
                 if (m_pWidget->GetFieldFlags() & FIELDFLAG_EDIT)
                 {
                         if (nCurSel >= 0)
                         {
                                 return nCurSel != m_pWidget->GetSelectedIndex(0);
                         }
                         else
@@ skipping 10 matching lines @@
         return FALSE;
 }
 
 void CFFL_ComboBox::SaveData(CPDFSDK_PageView* pPageView)
 {
         ASSERT(m_pWidget != NULL);
 
         if (CPWL_ComboBox* pWnd = (CPWL_ComboBox*)GetPDFWindow(pPageView, FALSE))
         {
                 CFX_WideString swText = pWnd->GetText();
-                FX_INT32 nCurSel = pWnd->GetSelect();
+                int32_t nCurSel = pWnd->GetSelect();
 
                 //mantis:0004157
                 FX_BOOL bSetValue = TRUE;
 
                 if (m_pWidget->GetFieldFlags() & FIELDFLAG_EDIT)
                 {
                         if (nCurSel >= 0)
                         {
                                 if (swText != m_pWidget->GetOptionLabel(nCurSel))
                                         bSetValue = TRUE;
@@ skipping 289 matching lines @@
                 if (CPDF_FormField * pFormField = m_pWidget->GetFormField())
                 {
                         swRet = pFormField->GetOptionValue(nExport);
                         if (swRet.IsEmpty())
                                 swRet = pFormField->GetOptionLabel(nExport);
                 }
         }
         
         return swRet;
 }