summaryrefslogtreecommitdiff
path: root/fpdfsdk/include
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk/include')
-rw-r--r--fpdfsdk/include/formfiller/FFL_FormFiller.h2
-rw-r--r--fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h24
-rw-r--r--fpdfsdk/include/fsdk_annothandler.h1
-rw-r--r--fpdfsdk/include/fx_systemhandler.h4
-rw-r--r--fpdfsdk/include/fxedit/fx_edit.h2
-rw-r--r--fpdfsdk/include/fxedit/fxet_list.h4
-rw-r--r--fpdfsdk/include/jsapi/fxjs_v8.h3
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_ComboBox.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_ListBox.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Note.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Signature.h2
11 files changed, 22 insertions, 26 deletions
diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h
index 3ad1e9d8c4..f15d40c7a3 100644
--- a/fpdfsdk/include/formfiller/FFL_FormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h
@@ -7,6 +7,8 @@
#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
#define FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
+#include <map>
+
#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h"
#include "fpdfsdk/include/formfiller/FFL_IFormFiller.h"
#include "fpdfsdk/include/fsdk_baseform.h"
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
index fa2c8a2752..2bc579c1da 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
@@ -114,23 +114,17 @@ class CPDFXFA_Document : public IXFA_DocProvider {
return 0;
}
- // SignaturePseudoModel method
- // TODO:
- virtual int32_t Verify(
- IXFA_Doc* hDoc,
- CXFA_Node* pSigNode,
- FX_BOOL
- bUsed = TRUE /*, SecurityHandler* pHandler, SignatureInfo &info*/) {
+ virtual int32_t Verify(IXFA_Doc* hDoc,
+ CXFA_Node* pSigNode,
+ FX_BOOL bUsed = TRUE) {
return 0;
}
- virtual FX_BOOL Sign(
- IXFA_Doc* hDoc,
- CXFA_NodeList* pNodeList,
- const CFX_WideStringC& wsExpression,
- const CFX_WideStringC& wsXMLIdent,
- const CFX_WideStringC& wsValue = FX_WSTRC(L"open"),
- FX_BOOL
- bUsed = TRUE /*, SecurityHandler* pHandler = NULL, SignatureInfo &info*/) {
+ virtual FX_BOOL Sign(IXFA_Doc* hDoc,
+ CXFA_NodeList* pNodeList,
+ const CFX_WideStringC& wsExpression,
+ const CFX_WideStringC& wsXMLIdent,
+ const CFX_WideStringC& wsValue = FX_WSTRC(L"open"),
+ FX_BOOL bUsed = TRUE) {
return 0;
}
virtual CXFA_NodeList* Enumerate(IXFA_Doc* hDoc) { return 0; }
diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h
index 407e94d236..703525dd0f 100644
--- a/fpdfsdk/include/fsdk_annothandler.h
+++ b/fpdfsdk/include/fsdk_annothandler.h
@@ -11,6 +11,7 @@
#include <vector>
#include "core/include/fxcrt/fx_basic.h"
+#include "xfa/include/fxfa/fxfa.h"
#ifdef PDF_ENABLE_XFA
#define FSDK_XFAWIDGET_TYPENAME "XFAWidget"
diff --git a/fpdfsdk/include/fx_systemhandler.h b/fpdfsdk/include/fx_systemhandler.h
index 4f64145844..bfd1ce188c 100644
--- a/fpdfsdk/include/fx_systemhandler.h
+++ b/fpdfsdk/include/fx_systemhandler.h
@@ -55,7 +55,7 @@ class IFX_SystemHandler {
virtual FX_BOOL IsSelectionImplemented() = 0;
virtual CFX_WideString GetClipboardText(FX_HWND hWnd) = 0;
- virtual FX_BOOL SetClipboardText(FX_HWND hWnd, CFX_WideString string) = 0;
+ virtual FX_BOOL SetClipboardText(FX_HWND hWnd, CFX_WideString str) = 0;
virtual void ClientToScreen(FX_HWND hWnd, int32_t& x, int32_t& y) = 0;
virtual void ScreenToClient(FX_HWND hWnd, int32_t& x, int32_t& y) = 0;
@@ -73,7 +73,7 @@ class IFX_SystemHandler {
virtual FX_HMENU CreatePopupMenu() = 0;
virtual FX_BOOL AppendMenuItem(FX_HMENU hMenu,
int32_t nIDNewItem,
- CFX_WideString string) = 0;
+ CFX_WideString str) = 0;
virtual FX_BOOL EnableMenuItem(FX_HMENU hMenu,
int32_t nIDItem,
FX_BOOL bEnabled) = 0;
diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h
index 089eecc1d9..d04b45d587 100644
--- a/fpdfsdk/include/fxedit/fx_edit.h
+++ b/fpdfsdk/include/fxedit/fx_edit.h
@@ -542,7 +542,7 @@ class IFX_List {
virtual int32_t GetItemIndex(const CFX_FloatPoint& point) const = 0;
virtual int32_t GetFirstSelected() const = 0;
- virtual void AddString(const FX_WCHAR* string) = 0;
+ virtual void AddString(const FX_WCHAR* str) = 0;
virtual void SetTopItem(int32_t nIndex) = 0;
virtual void Select(int32_t nItemIndex) = 0;
virtual void SetCaret(int32_t nItemIndex) = 0;
diff --git a/fpdfsdk/include/fxedit/fxet_list.h b/fpdfsdk/include/fxedit/fxet_list.h
index a02cd8a45e..4f1274c1aa 100644
--- a/fpdfsdk/include/fxedit/fxet_list.h
+++ b/fpdfsdk/include/fxedit/fxet_list.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_
#define FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_
-#include "core/include/fpdfapi/fpdf_parser.h" // For CFX_FloatPoint.
+#include "core/include/fpdfapi/fpdf_parser.h"
#include "fpdfsdk/include/fxedit/fx_edit.h"
class IFX_Edit;
@@ -307,7 +307,7 @@ class CFX_ListCtrl : public CFX_List {
int32_t GetTopItem() const override;
CFX_FloatRect GetContentRect() const override;
int32_t GetItemIndex(const CFX_FloatPoint& point) const override;
- void AddString(const FX_WCHAR* string) override;
+ void AddString(const FX_WCHAR* str) override;
void SetTopItem(int32_t nIndex) override;
void Select(int32_t nItemIndex) override;
void SetCaret(int32_t nItemIndex) override;
diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h
index 64fa01bd44..dccb261b06 100644
--- a/fpdfsdk/include/jsapi/fxjs_v8.h
+++ b/fpdfsdk/include/jsapi/fxjs_v8.h
@@ -286,8 +286,7 @@ v8::Local<v8::Value> FXJS_NewObject(v8::Isolate* pIsolate,
v8::Local<v8::Object> pObj);
v8::Local<v8::Value> FXJS_NewObject2(v8::Isolate* pIsolate,
v8::Local<v8::Array> pObj);
-v8::Local<v8::Value> FXJS_NewString(v8::Isolate* pIsolate,
- const wchar_t* string);
+v8::Local<v8::Value> FXJS_NewString(v8::Isolate* pIsolate, const wchar_t* str);
v8::Local<v8::Value> FXJS_NewNull();
v8::Local<v8::Value> FXJS_NewDate(v8::Isolate* pIsolate, double d);
diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
index e5383009b9..b08e954947 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
@@ -71,7 +71,7 @@ class CPWL_ComboBox : public CPWL_Wnd {
CFX_WideString GetText() const;
void SetText(const FX_WCHAR* text);
- void AddString(const FX_WCHAR* string);
+ void AddString(const FX_WCHAR* str);
int32_t GetSelect() const;
void SetSelect(int32_t nItemIndex);
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
index ced4e73d03..e12d727d58 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
@@ -81,7 +81,7 @@ class CPWL_ListBox : public CPWL_Wnd {
void OnNotifySelChanged(FX_BOOL bKeyDown, FX_BOOL& bExit, FX_DWORD nFlag);
- void AddString(const FX_WCHAR* string);
+ void AddString(const FX_WCHAR* str);
void SetTopVisibleIndex(int32_t nItemIndex);
void ScrollToListItem(int32_t nItemIndex);
void ResetContent();
diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/include/pdfwindow/PWL_Note.h
index 8087585cee..cb04aaebad 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Note.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Note.h
@@ -305,7 +305,7 @@ class CPWL_Note : public CPWL_NoteItem {
void EnableModify(FX_BOOL bEnabled);
CFX_WideString GetReplyString() const;
- void SetReplyString(const CFX_WideString& string);
+ void SetReplyString(const CFX_WideString& str);
// CPWL_NoteItem
void SetSubjectName(const CFX_WideString& sName) override;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Signature.h b/fpdfsdk/include/pdfwindow/PWL_Signature.h
index 1f2fa733b2..209782a0b8 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Signature.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Signature.h
@@ -38,7 +38,7 @@ class CPWL_Signature : public CPWL_Wnd {
~CPWL_Signature() override;
void SetText(const FX_WCHAR* sText);
- void SetDescription(const FX_WCHAR* string);
+ void SetDescription(const FX_WCHAR* str);
void SetImage(CFX_DIBSource* pImage);
void SetImageStream(CPDF_Stream* pStream, const FX_CHAR* sImageAlias);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 18:36:46 +0000