Remove CFX_MapPtrTemplate usage in fsdk_baseform.cpp

fpdfsdk/include/fsdk_baseform.h

 // 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
 
 #ifndef FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 #define FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 
 #include <map>
@@ skipping 225 matching lines @@
   CFX_ByteString GetType() const override;
   CFX_ByteString GetSubType() const override { return ""; }
   CFX_FloatRect GetRect() const override;
 
   CPDFSDK_InterForm* GetInterForm() { return m_pInterForm; }
 
  private:
   CPDFSDK_InterForm* m_pInterForm;
   CXFA_FFWidget* m_hXFAWidget;
 };
-#define CPDFSDK_XFAWidgetMap \
-  CFX_MapPtrTemplate<CXFA_FFWidget*, CPDFSDK_XFAWidget*>
-#define CPDFSDK_FieldSynchronizeMap CFX_MapPtrTemplate<CPDF_FormField*, int>
 #endif  // PDF_ENABLE_XFA
 
 class CPDFSDK_InterForm : public CPDF_FormNotify {
  public:
   explicit CPDFSDK_InterForm(CPDFSDK_Document* pDocument);
   ~CPDFSDK_InterForm() override;
 
   CPDF_InterForm* GetInterForm() const { return m_pInterForm; }
   CPDFSDK_Document* GetDocument() const { return m_pDocument; }
 
@@ skipping 75 matching lines @@
   FX_BOOL FDFToURLEncodedData(uint8_t*& pBuf, FX_STRSIZE& nBufSize);
   int GetPageIndexByAnnotDict(CPDF_Document* pDocument,
                               CPDF_Dictionary* pAnnotDict) const;
 
   using CPDFSDK_WidgetMap = std::map<CPDF_FormControl*, CPDFSDK_Widget*>;
 
   CPDFSDK_Document* m_pDocument;
   CPDF_InterForm* m_pInterForm;
   CPDFSDK_WidgetMap m_Map;
 #ifdef PDF_ENABLE_XFA
-  CPDFSDK_XFAWidgetMap m_XFAMap;
-  CPDFSDK_FieldSynchronizeMap m_FieldSynchronizeMap;
+  std::map<CXFA_FFWidget*, CPDFSDK_XFAWidget*> m_XFAMap;
   FX_BOOL m_bXfaCalculate;
   FX_BOOL m_bXfaValidationsEnabled;
 #endif  // PDF_ENABLE_XFA
   FX_BOOL m_bCalculate;
   FX_BOOL m_bBusy;
 
  public:
   FX_BOOL IsNeedHighLight(int nFieldType);
   void RemoveAllHighLight();
   void SetHighlightAlpha(uint8_t alpha) { m_iHighlightAlpha = alpha; }
@@ skipping 38 matching lines @@
                                      const CPDFSDK_Annot* p2);
 
   TabOrder m_eTabOrder;
   CPDFSDK_PageView* m_pPageView;
   CFX_ByteString m_sType;
   CFX_ByteString m_sSubType;
   std::vector<CPDFSDK_Annot*> m_Annots;
 };
 
 #endif  // FPDFSDK_INCLUDE_FSDK_BASEFORM_H_