Revert "FX Bool considered harmful, part 3"
[pdfium.git] / fpdfsdk / include / fsdk_baseform.h
index 718ff60..edbd5e4 100644 (file)
@@ -13,6 +13,8 @@
 #include <ctime>
 #endif
 
+#include <map>
+
 #include "../../core/include/fpdfapi/fpdf_parser.h"
 #include "../../core/include/fpdfdoc/fpdf_doc.h"
 #include "../../core/include/fxcrt/fx_basic.h"
@@ -165,8 +167,6 @@ private:
        int32_t                                         m_nValueAge;
 };
 
-#define CPDFSDK_WidgetMap                              CFX_MapPtrTemplate<CPDF_FormControl*, CPDFSDK_Widget*>
-
 class CPDFSDK_InterForm : public CPDF_FormNotify
 {
 public:
@@ -201,7 +201,6 @@ public:
        void                                                    ResetFieldAppearance(CPDF_FormField* pFormField, const FX_WCHAR* sValue, FX_BOOL bValueChanged);
        void                                                    UpdateField(CPDF_FormField* pFormField);
 
-public:
        FX_BOOL                                                 DoAction_Hide(const CPDF_Action& action);
        FX_BOOL                                                 DoAction_SubmitForm(const CPDF_Action& action);
        FX_BOOL                                                 DoAction_ResetForm(const CPDF_Action& action);
@@ -227,18 +226,18 @@ private:
        virtual int                                             BeforeFormImportData(const CPDF_InterForm* pForm);
        virtual int                                             AfterFormImportData(const CPDF_InterForm* pForm);
 
-private:
        FX_BOOL                                                 FDFToURLEncodedData(CFX_WideString csFDFFile, CFX_WideString csTxtFile);
        FX_BOOL                                                 FDFToURLEncodedData(uint8_t*& pBuf, FX_STRSIZE& nBufSize);
        int                                                             GetPageIndexByAnnotDict(CPDF_Document* pDocument, CPDF_Dictionary* pAnnotDict) const;
        void                                                    DoFDFBuffer(CFX_ByteString sBuffer);
 
-private:
-       CPDFSDK_Document*                               m_pDocument;
-       CPDF_InterForm*                                 m_pInterForm;
-       CPDFSDK_WidgetMap                               m_Map;
-       FX_BOOL                                                 m_bCalculate;
-       FX_BOOL                                                 m_bBusy;
+    using CPDFSDK_WidgetMap = std::map<CPDF_FormControl*, CPDFSDK_Widget*>;
+
+    CPDFSDK_Document* m_pDocument;
+    CPDF_InterForm* m_pInterForm;
+    CPDFSDK_WidgetMap m_Map;
+    FX_BOOL m_bCalculate;
+    FX_BOOL m_bBusy;
 
 public:
        FX_BOOL IsNeedHighLight(int nFieldType);