From 7da980351d6fc428fd95be3015081d911f4470c0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 19 Aug 2015 10:42:45 -0700 Subject: Merge to XFA: Extern in .cpp files is a code smell, part 1. (cherry picked from commit 71c15a5e6652952a94ba3a3ef7ac0392e3a06962) Original Review URL: https://codereview.chromium.org/1299963002 . R=thestig@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1301073003 . --- fpdfsdk/include/fsdk_define.h | 3 +++ fpdfsdk/src/fpdf_dataavail.cpp | 2 -- fpdfsdk/src/fpdftext.cpp | 3 --- fpdfsdk/src/fpdfview.cpp | 2 -- fpdfsdk/src/fsdk_mgr.cpp | 7 ------- fpdfsdk/src/javascript/global.cpp | 17 ++++++++--------- 6 files changed, 11 insertions(+), 23 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index 4057036560..d13f37968d 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -104,4 +104,7 @@ void FPDF_RenderPage_Retail(CRenderContext* pContext, FX_BOOL bNeedToRestore, IFSDK_PAUSE_Adapter* pause); +void CheckUnSupportError(CPDF_Document* pDoc, FX_DWORD err_code); +void CheckUnSupportAnnot(CPDF_Document* pDoc, CPDF_Annot* pPDFAnnot); + #endif // FPDFSDK_INCLUDE_FSDK_DEFINE_H_ diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp index b9cf69d647..663e166b03 100644 --- a/fpdfsdk/src/fpdf_dataavail.cpp +++ b/fpdfsdk/src/fpdf_dataavail.cpp @@ -98,8 +98,6 @@ DLLEXPORT int STDCALL FPDFAvail_IsDocAvail(FPDF_AVAIL avail, return ((CFPDF_DataAvail*)avail)->m_pDataAvail->IsDocAvail(&hints_wrap); } -extern void CheckUnSupportError(CPDF_Document* pDoc, FX_DWORD err_code); - DLLEXPORT FPDF_DOCUMENT STDCALL FPDFAvail_GetDocument(FPDF_AVAIL avail, FPDF_BYTESTRING password) { if (avail == NULL) diff --git a/fpdfsdk/src/fpdftext.cpp b/fpdfsdk/src/fpdftext.cpp index e6bb9f0709..e589618106 100644 --- a/fpdfsdk/src/fpdftext.cpp +++ b/fpdfsdk/src/fpdftext.cpp @@ -14,9 +14,6 @@ #include #endif -// jabdelmalek: commented out to build on Linux. Not used. -// extern HANDLE g_hModule; - DLLEXPORT FPDF_TEXTPAGE STDCALL FPDFText_LoadPage(FPDF_PAGE page) { if (!page) return NULL; diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index 89571a6f9d..c2b53bebcd 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -300,8 +300,6 @@ DLLEXPORT FPDF_BOOL STDCALL FPDF_LoadXFA(FPDF_DOCUMENT document) { return document && (static_cast(document))->LoadXFADoc(); } -extern void CheckUnSupportError(CPDF_Document* pDoc, FX_DWORD err_code); - class CMemFile final : public IFX_FileRead { public: CMemFile(uint8_t* pBuf, FX_FILESIZE size) : m_pBuf(pBuf), m_size(size) {} diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index a119781a46..bdffb8f6d8 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -1073,16 +1073,9 @@ FX_BOOL CPDFSDK_PageView::OnKeyDown(int nKeyCode, int nFlag) { } FX_BOOL CPDFSDK_PageView::OnKeyUp(int nKeyCode, int nFlag) { - // if(CPDFSDK_Annot* pAnnot = GetFocusAnnot()) - // { - // CFFL_IFormFiller* pIFormFiller = g_pFormFillApp->GetIFormFiller(); - // return pIFormFiller->OnKeyUp(pAnnot, nKeyCode, nFlag); - // } return FALSE; } -extern void CheckUnSupportAnnot(CPDF_Document* pDoc, CPDF_Annot* pPDFAnnot); - void CPDFSDK_PageView::LoadFXAnnots() { ASSERT(m_page != NULL); diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp index dea2b5852c..f8be3687db 100644 --- a/fpdfsdk/src/javascript/global.cpp +++ b/fpdfsdk/src/javascript/global.cpp @@ -39,19 +39,18 @@ struct CHash { static const unsigned value = CHash::value, Ns...>::value; }; -extern const unsigned int JSCONST_nStringHash = +const unsigned int JSCONST_nStringHash = CHash<'s', 't', 'r', 'i', 'n', 'g'>::value; -extern const unsigned int JSCONST_nNumberHash = +const unsigned int JSCONST_nNumberHash = CHash<'n', 'u', 'm', 'b', 'e', 'r'>::value; -extern const unsigned int JSCONST_nBoolHash = +const unsigned int JSCONST_nBoolHash = CHash<'b', 'o', 'o', 'l', 'e', 'a', 'n'>::value; -extern const unsigned int JSCONST_nDateHash = CHash<'d', 'a', 't', 'e'>::value; -extern const unsigned int JSCONST_nObjectHash = +const unsigned int JSCONST_nDateHash = CHash<'d', 'a', 't', 'e'>::value; +const unsigned int JSCONST_nObjectHash = CHash<'o', 'b', 'j', 'e', 'c', 't'>::value; -extern const unsigned int JSCONST_nFXobjHash = - CHash<'f', 'x', 'o', 'b', 'j'>::value; -extern const unsigned int JSCONST_nNullHash = CHash<'n', 'u', 'l', 'l'>::value; -extern const unsigned int JSCONST_nUndefHash = +const unsigned int JSCONST_nFXobjHash = CHash<'f', 'x', 'o', 'b', 'j'>::value; +const unsigned int JSCONST_nNullHash = CHash<'n', 'u', 'l', 'l'>::value; +const unsigned int JSCONST_nUndefHash = CHash<'u', 'n', 'd', 'e', 'f', 'i', 'n', 'e', 'd'>::value; #ifdef _DEBUG -- cgit v1.2.3