summaryrefslogtreecommitdiff
path: root/fpdfsdk/include
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-02-17 10:07:21 -0800
committerTom Sepez <tsepez@chromium.org>2016-02-17 10:07:21 -0800
commitab27768d235985c0789a10ab490be43e262f48f6 (patch)
tree692c2707020bee87753c05208c7d0c6f176ff30b /fpdfsdk/include
parent32c70815316672091946be88e5941089c359d151 (diff)
downloadpdfium-ab27768d235985c0789a10ab490be43e262f48f6.tar.xz
Banish CFX_ByteArray and CFX_WideArray to the XFA side.
Fix IWYU and include paths as we go. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1701883004 .
Diffstat (limited to 'fpdfsdk/include')
-rw-r--r--fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h4
-rw-r--r--fpdfsdk/include/fsdk_mgr.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Wnd.h4
3 files changed, 7 insertions, 3 deletions
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
index 64b3875629..eb064d2682 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
@@ -7,6 +7,8 @@
#ifndef FPDFXFA_DOC_H_
#define FPDFXFA_DOC_H_
+#include <vector>
+
#include "public/fpdfview.h"
#include "xfa/include/fxfa/fxfa.h"
@@ -161,7 +163,7 @@ class CPDFXFA_Document : public IXFA_DocProvider {
}
virtual FX_BOOL GetSuggestWords(IXFA_Doc* hDoc,
const CFX_ByteStringC& sWord,
- CFX_ByteStringArray& sSuggest) {
+ std::vector<CFX_ByteString>& sSuggest) {
return FALSE;
}
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index bef3b980fe..5fdf645306 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -378,7 +378,7 @@ class CPDFDoc_Environment final {
FPDF_BOOL FFI_ShowFileDialog(const FX_WCHAR* wsTitle,
const FX_WCHAR* wsFilter,
- CFX_WideStringArray& wsPathArr,
+ std::vector<CFX_WideString>& wsPathArr,
FX_BOOL bOpen) {
return FALSE;
}
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
index 058057bb76..1bc5023c98 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -7,6 +7,8 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
+#include <vector>
+
#include "core/include/fpdfdoc/fpdf_doc.h"
#include "core/include/fxcrt/fx_basic.h"
#include "fpdfsdk/include/fx_systemhandler.h"
@@ -171,7 +173,7 @@ class IPWL_SpellCheck {
virtual ~IPWL_SpellCheck() {}
virtual FX_BOOL CheckWord(const FX_CHAR* sWord) = 0;
virtual void SuggestWords(const FX_CHAR* sWord,
- CFX_ByteStringArray& sSuggest) = 0;
+ std::vector<CFX_ByteString>& sSuggest) = 0;
};
class IPWL_Provider {