Merge to XFA: Kill off JS_ErrorString type.

fpdfsdk/include/fsdk_mgr.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_MGR_H
 #define _FPDFSDK_MGR_H
 
 #include "fsdk_common.h"
@@ skipping 21 matching lines @@
 class CJS_RuntimeFactory;
 
 #include "javascript/IJavaScript.h"
 
 class CPDFDoc_Environment FX_FINAL
 {
 public:
         CPDFDoc_Environment(CPDFXFA_Document * pDoc);
         ~CPDFDoc_Environment();
 
-        int RegAppHandle(FPDF_FORMFILLINFO* pFFinfo);//{ m_pInfo  = pFFinfo; return TRUE;}
+        int RegAppHandle(FPDF_FORMFILLINFO* pFFinfo);
 
         virtual void            Release()
         {
                 if (m_pInfo && m_pInfo->Release)
                         m_pInfo->Release(m_pInfo);
                 delete this;
         }
         void FFI_Invalidate(FPDF_PAGE page, double left, double top, double right, double bottom)
         {
                 if (m_pInfo && m_pInfo->FFI_Invalidate)
@@ skipping 620 matching lines @@
                                 return L"";
                         }
                         CFX_ByteString bsRet = CFX_ByteString(pbuff, nActualLen);
                         CFX_WideString wsRet = CFX_WideString::FromUTF16LE((unsigned short*)bsRet.GetBuffer(bsRet.GetLength()), bsRet.GetLength()/sizeof(unsigned short));
                         delete[] pbuff;
                         return wsRet;
                 }
                 return L"";
         }
 
-public:
         FX_BOOL                         IsJSInitiated();
 
-public:
         void                            SetCurrentDoc(CPDFSDK_Document* pFXDoc) {m_pSDKDoc = pFXDoc;}
         CPDFSDK_Document*       GetCurrentDoc();
         CPDFXFA_Document*       GetPDFXFADocument() {return m_pDoc;}
-//      CPDFSDK_Document*   GetDocument(int nIndex);
-//      int                                     CountDocuments() {return m_docMap.GetCount();}
-
-        CPDFSDK_Document*               OpenDocument(CFX_WideString &fileName){return NULL;}
-        CPDFSDK_Document*               OpenMemPDFDoc(CPDF_Document* pNewDoc, CFX_WideString &fileName){return NULL;}
-
 
         CFX_ByteString          GetAppName() {return "";}
 
         CFFL_IFormFiller*       GetIFormFiller();
         IFX_SystemHandler*      GetSysHandler() {return m_pSysHandler;}
 
-public:
         CPDFSDK_AnnotHandlerMgr* GetAnnotHandlerMgr();
         IFXJS_Runtime*  GetJSRuntime();
         CPDFSDK_ActionHandler* GetActionHander();
+        FPDF_FORMFILLINFO* GetFormFillInfo() {return m_pInfo;}
+
 private:
         CPDFSDK_AnnotHandlerMgr* m_pAnnotHandlerMgr;
         CPDFSDK_ActionHandler*  m_pActionHandler;
         IFXJS_Runtime*  m_pJSRuntime;
-public:
-        FPDF_FORMFILLINFO* GetFormFillInfo() {return m_pInfo;}
-private:
         FPDF_FORMFILLINFO*      m_pInfo;
-//      CFX_MapPtrTemplate<CPDF_Document*, CPDFSDK_Document*> m_docMap;
         CPDFSDK_Document* m_pSDKDoc;
         CPDFXFA_Document* m_pDoc;
 
         CFFL_IFormFiller* m_pIFormFiller;
         IFX_SystemHandler* m_pSysHandler;
 
 public:
         //CJS_RuntimeFactory*  m_pJSRuntimeFactory;
 };
 
 
 
-// class CFX_App
-// {
-// public:
-//      CFX_App():m_pCurDoc(NULL) {}
-//      void SetAt(CPDF_Document* pPDFDoc, CPDFSDK_Document* pFXDoc);
-//      CPDFSDK_Document* GetAt(CPDF_Document* pPDFDoc);
-// public:
-//      void SetCurrentDocument(CPDFSDK_Document* pFXDoc) {m_pCurDoc = pFXDoc;}
-//      CPDFSDK_Document* GetCurrentDocument() {return m_pCurDoc;}
-// private:
-//      CFX_MapPtrTemplate<CPDF_Document*, CPDFSDK_Document*> m_docArray;
-//      CPDFSDK_Document* m_pCurDoc;
-// };
 class CPDFSDK_InterForm;
 class CPDFSDK_Document
 {
 public:
         CPDFSDK_Document(CPDFXFA_Document* pDoc, CPDFDoc_Environment* pEnv);
         ~CPDFSDK_Document();
-public:
+
         CPDFSDK_InterForm*              GetInterForm() ;
         CPDFXFA_Document*               GetDocument() {return m_pDoc;}
 
-public:
         void                                    InitPageView();
         int                                             GetPageViewCount(){return m_pageMap.GetCount();}
         void                                    AddPageView(CPDFXFA_Page* pPDFXFAPage, CPDFSDK_PageView* pPageView);
         CPDFSDK_PageView*               GetPageView(CPDFXFA_Page* pPDFXFAPage, FX_BOOL ReNew = TRUE);
         CPDFSDK_PageView*               GetPageView(int nIndex);
         CPDFSDK_PageView*               GetCurrentView();
         void                                    ReMovePageView(CPDFXFA_Page* pPDFPage);
         void                                    UpdateAllViews(CPDFSDK_PageView* pSender, CPDFSDK_Annot* pAnnot);
 
-        CPDFSDK_Annot*                  GetFocusAnnot();//{return NULL;}
+        CPDFSDK_Annot*                  GetFocusAnnot();
 
         IFXJS_Runtime *                 GetJsRuntime();
 
-        FX_BOOL                                 SetFocusAnnot(CPDFSDK_Annot* pAnnot, FX_UINT nFlag = 0);//{return FALSE;}
+        FX_BOOL                                 SetFocusAnnot(CPDFSDK_Annot* pAnnot, FX_UINT nFlag = 0);
         FX_BOOL                                 KillFocusAnnot(FX_UINT nFlag = 0);
 
         FX_BOOL                                 ExtractPages(const CFX_WordArray &arrExtraPages, CPDF_Document* pDstDoc);
         FX_BOOL                                 InsertPages(int nInsertAt, const CPDF_Document* pSrcDoc, const CFX_WordArray &arrSrcPages);
         FX_BOOL                                 DeletePages(int nStart, int nCount);
         FX_BOOL                                 ReplacePages(int nPage, const CPDF_Document* pSrcDoc, const CFX_WordArray &arrSrcPages);
 
         void                                    OnCloseDocument();
 
         int                                             GetPageCount() {return m_pDoc->GetPageCount();}
         FX_BOOL                                 GetPermissions(int nFlag);
         FX_BOOL                                 GetChangeMark() {return m_bChangeMask;}
         void                                    SetChangeMark() {m_bChangeMask = TRUE;}
         void                                    ClearChangeMark() {m_bChangeMask= FALSE;}
-//      FX_BOOL                                 GetChangeMark(){return FALSE;}//IsAnnotModified()||IsFormModified() || IsWidgetModified()|| m_nChangeMark>0 ;}
-//      void                    ClearChangeMark(){}
         CFX_WideString                  GetPath() ;
         CPDFXFA_Page*                   GetPage(int nIndex);
         CPDFDoc_Environment *   GetEnv() {return m_pEnv; }
         void                                ProcJavascriptFun();
         FX_BOOL                                 ProcOpenAction();
         CPDF_OCContext*                 GetOCContext();
 private:
-        //CFX_ArrayTemplate<CPDFSDK_PageView*> m_pageArray;
         CFX_MapPtrTemplate<CPDFXFA_Page*, CPDFSDK_PageView*> m_pageMap;
         CPDFXFA_Document*                       m_pDoc;
-
         CPDFSDK_InterForm*              m_pInterForm;
         CPDFSDK_Annot*                  m_pFocusAnnot;
         CPDFDoc_Environment *   m_pEnv;
         CPDF_OCContext *                m_pOccontent;
         FX_BOOL                                 m_bChangeMask;
 };
 
 class CPDFSDK_PageView FX_FINAL
 {
 public:
@@ skipping 137 matching lines @@
                         }
                 }
 
                 if (nStartPos < m) QuickSort(nStartPos, m, bAscend, pCompare);
                 if (nStopPos > m) QuickSort(m, nStopPos, bAscend, pCompare);
         }
 };
 
 
 #endif //_FPDFSDK_MGR_H