diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-08-19 14:13:36 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-08-19 14:13:36 -0700 |
commit | 5417f067844892644486d7b0581c247904059a88 (patch) | |
tree | 34597c3bf0363c807c2cd9226cb7d7537ea60470 /fpdfsdk | |
parent | 7da980351d6fc428fd95be3015081d911f4470c0 (diff) | |
download | pdfium-5417f067844892644486d7b0581c247904059a88.tar.xz |
Merge to XFA: Extern in .cpp file is a code smell, part 2.
(cherry picked from commit c3f4894a6862c74b9ab32b4ec38c531de6ecd83c)
Original Review URL: https://codereview.chromium.org/1298393003 .
Fixed IWYU in core/src/fpdftext/text_int.h exposed by new inclusion.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1294933008 .
Diffstat (limited to 'fpdfsdk')
-rw-r--r-- | fpdfsdk/include/fsdk_define.h | 1 | ||||
-rw-r--r-- | fpdfsdk/include/fxedit/fx_edit.h | 5 | ||||
-rw-r--r-- | fpdfsdk/src/fpdf_dataavail.cpp | 1 | ||||
-rw-r--r-- | fpdfsdk/src/fxedit/fxet_pageobjs.cpp | 5 |
4 files changed, 6 insertions, 6 deletions
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index d13f37968d..43283c143c 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -106,5 +106,6 @@ void FPDF_RenderPage_Retail(CRenderContext* pContext, void CheckUnSupportError(CPDF_Document* pDoc, FX_DWORD err_code); void CheckUnSupportAnnot(CPDF_Document* pDoc, CPDF_Annot* pPDFAnnot); +void ProcessParseError(FX_DWORD err_code); #endif // FPDFSDK_INCLUDE_FSDK_DEFINE_H_ diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h index 4f8b2fbd67..23acbfa79f 100644 --- a/fpdfsdk/include/fxedit/fx_edit.h +++ b/fpdfsdk/include/fxedit/fx_edit.h @@ -568,4 +568,9 @@ class IFX_List { virtual ~IFX_List() {} }; +CFX_ByteString GetPDFWordString(IFX_Edit_FontMap* pFontMap, + int32_t nFontIndex, + FX_WORD Word, + FX_WORD SubWord); + #endif // FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_ diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp index 663e166b03..58bd384bf5 100644 --- a/fpdfsdk/src/fpdf_dataavail.cpp +++ b/fpdfsdk/src/fpdf_dataavail.cpp @@ -10,7 +10,6 @@ #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_app.h" -extern void ProcessParseError(FX_DWORD err_code); class CFPDF_FileAvailWrap : public IFX_FileAvail { public: CFPDF_FileAvailWrap() { m_pfileAvail = NULL; } diff --git a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp index 1fb669bb57..9c18943a81 100644 --- a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp +++ b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp @@ -11,11 +11,6 @@ #define FX_EDIT_UNDERLINEHALFWIDTH 0.5f #define FX_EDIT_CROSSOUTHALFWIDTH 0.5f -extern CFX_ByteString GetPDFWordString(IFX_Edit_FontMap* pFontMap, - int32_t nFontIndex, - FX_WORD Word, - FX_WORD SubWord); - CPDF_Rect GetUnderLineRect(const CPVT_Word& word) { return CPDF_Rect(word.ptWord.x, word.ptWord.y + word.fDescent * 0.5f, word.ptWord.x + word.fWidth, |