From d3116dc173ab3e798b056e008c0cb68f69acdca7 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 24 Nov 2015 15:58:06 -0800 Subject: XFA: DYNIMIC is spelled DYNAMIC R=thestig@chromium.org Review URL: https://codereview.chromium.org/1473053003 . --- fpdfsdk/src/fpdfsave.cpp | 6 +++--- fpdfsdk/src/fpdfview.cpp | 2 +- fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp | 26 +++++++++++++------------- fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp | 8 ++++---- fpdfsdk/src/fsdk_mgr.cpp | 6 +++--- public/fpdf_formfill.h | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/src/fpdfsave.cpp index 8f9ee7794d..882161c8fe 100644 --- a/fpdfsdk/src/fpdfsave.cpp +++ b/fpdfsdk/src/fpdfsave.cpp @@ -64,7 +64,7 @@ FX_BOOL _SaveXFADocumentData(CPDFXFA_Document* pDocument, #ifdef PDF_ENABLE_XFA if (!pDocument) return FALSE; - if (pDocument->GetDocType() != DOCTYPE_DYNIMIC_XFA && + if (pDocument->GetDocType() != DOCTYPE_DYNAMIC_XFA && pDocument->GetDocType() != DOCTYPE_STATIC_XFA) return TRUE; if (!CPDFXFA_App::GetInstance()->GetXFAApp()) @@ -230,7 +230,7 @@ FX_BOOL _SendPostSaveToXFADoc(CPDFXFA_Document* pDocument) { if (!pDocument) return FALSE; - if (pDocument->GetDocType() != DOCTYPE_DYNIMIC_XFA && + if (pDocument->GetDocType() != DOCTYPE_DYNAMIC_XFA && pDocument->GetDocType() != DOCTYPE_STATIC_XFA) return TRUE; @@ -257,7 +257,7 @@ FX_BOOL _SendPostSaveToXFADoc(CPDFXFA_Document* pDocument) { FX_BOOL _SendPreSaveToXFADoc(CPDFXFA_Document* pDocument, CFX_PtrArray& fileList) { - if (pDocument->GetDocType() != DOCTYPE_DYNIMIC_XFA && + if (pDocument->GetDocType() != DOCTYPE_DYNAMIC_XFA && pDocument->GetDocType() != DOCTYPE_STATIC_XFA) return TRUE; IXFA_DocView* pXFADocView = pDocument->GetXFADocView(); diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index 1ff1004880..adb14cd3b9 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -317,7 +317,7 @@ DLLEXPORT FPDF_BOOL STDCALL FPDF_HasXFAField(FPDF_DOCUMENT document, FX_BOOL bDynamicXFA = pRoot->GetBoolean("NeedsRendering", FALSE); if (bDynamicXFA) - *docType = DOCTYPE_DYNIMIC_XFA; + *docType = DOCTYPE_DYNAMIC_XFA; else *docType = DOCTYPE_STATIC_XFA; diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp index b188035ccc..16f3209af3 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp @@ -109,7 +109,7 @@ FX_BOOL CPDFXFA_Document::LoadXFADoc() { pDocHandler->SetJSERuntime(m_pXFADoc, m_pApp->GetJSERuntime()); if (pDocHandler->GetDocType(m_pXFADoc) == XFA_DOCTYPE_Dynamic) - m_iDocType = DOCTYPE_DYNIMIC_XFA; + m_iDocType = DOCTYPE_DYNAMIC_XFA; else m_iDocType = DOCTYPE_STATIC_XFA; @@ -134,7 +134,7 @@ int CPDFXFA_Document::GetPageCount() { case DOCTYPE_STATIC_XFA: if (m_pPDFDoc) return m_pPDFDoc->GetPageCount(); - case DOCTYPE_DYNIMIC_XFA: + case DOCTYPE_DYNAMIC_XFA: if (m_pXFADoc) return m_pXFADocView->CountPageViews(); default: @@ -178,7 +178,7 @@ CPDFXFA_Page* CPDFXFA_Document::GetPage(IXFA_PageView* pPage) { if (!m_pXFADoc) return NULL; - if (m_iDocType != DOCTYPE_DYNIMIC_XFA) + if (m_iDocType != DOCTYPE_DYNAMIC_XFA) return NULL; int nSize = m_XFAPageList.GetSize(); @@ -238,7 +238,7 @@ void CPDFXFA_Document::InvalidateRect(IXFA_PageView* pPageView, if (!m_pXFADoc || !m_pSDKDoc) return; - if (m_iDocType != DOCTYPE_DYNIMIC_XFA) + if (m_iDocType != DOCTYPE_DYNAMIC_XFA) return; CPDF_Rect rcPage; @@ -265,7 +265,7 @@ void CPDFXFA_Document::InvalidateRect(IXFA_Widget* hWidget, if (!m_pXFADoc || !m_pSDKDoc || !m_pXFADocView) return; - if (m_iDocType != DOCTYPE_DYNIMIC_XFA) + if (m_iDocType != DOCTYPE_DYNAMIC_XFA) return; IXFA_WidgetHandler* pWidgetHandler = m_pXFADocView->GetWidgetHandler(); @@ -290,7 +290,7 @@ void CPDFXFA_Document::DisplayCaret(IXFA_Widget* hWidget, if (!m_pXFADoc || !m_pSDKDoc || !m_pXFADocView) return; - if (m_iDocType != DOCTYPE_DYNIMIC_XFA) + if (m_iDocType != DOCTYPE_DYNAMIC_XFA) return; IXFA_WidgetHandler* pWidgetHandler = m_pXFADocView->GetWidgetHandler(); @@ -498,7 +498,7 @@ void CPDFXFA_Document::WidgetEvent(IXFA_Widget* hWidget, FX_DWORD dwEvent, void* pParam, void* pAdditional) { - if (m_iDocType != DOCTYPE_DYNIMIC_XFA || !hWidget) + if (m_iDocType != DOCTYPE_DYNAMIC_XFA || !hWidget) return; CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); @@ -535,7 +535,7 @@ int32_t CPDFXFA_Document::CountPages(IXFA_Doc* hDoc) { int32_t CPDFXFA_Document::GetCurrentPage(IXFA_Doc* hDoc) { if (hDoc != m_pXFADoc || !m_pSDKDoc) return -1; - if (m_iDocType != DOCTYPE_DYNIMIC_XFA) + if (m_iDocType != DOCTYPE_DYNAMIC_XFA) return -1; CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); @@ -547,7 +547,7 @@ int32_t CPDFXFA_Document::GetCurrentPage(IXFA_Doc* hDoc) { void CPDFXFA_Document::SetCurrentPage(IXFA_Doc* hDoc, int32_t iCurPage) { if (hDoc != m_pXFADoc || !m_pSDKDoc) return; - if (m_iDocType != DOCTYPE_DYNIMIC_XFA) + if (m_iDocType != DOCTYPE_DYNAMIC_XFA) return; CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); @@ -603,7 +603,7 @@ void CPDFXFA_Document::ExportData(IXFA_Doc* hDoc, FX_BOOL bXDP) { if (hDoc != m_pXFADoc) return; - if (m_iDocType != DOCTYPE_DYNIMIC_XFA && m_iDocType != DOCTYPE_STATIC_XFA) + if (m_iDocType != DOCTYPE_DYNAMIC_XFA && m_iDocType != DOCTYPE_STATIC_XFA) return; CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); if (pEnv == NULL) @@ -711,7 +711,7 @@ void CPDFXFA_Document::GotoURL(IXFA_Doc* hDoc, if (hDoc != m_pXFADoc) return; - if (m_iDocType != DOCTYPE_DYNIMIC_XFA) + if (m_iDocType != DOCTYPE_DYNAMIC_XFA) return; CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); @@ -825,7 +825,7 @@ FX_BOOL CPDFXFA_Document::_NotifySubmit(FX_BOOL bPrevOrPost) { FX_BOOL CPDFXFA_Document::_OnBeforeNotifySumbit() { #ifdef PDF_ENABLE_XFA - if (m_iDocType != DOCTYPE_DYNIMIC_XFA && m_iDocType != DOCTYPE_STATIC_XFA) + if (m_iDocType != DOCTYPE_DYNAMIC_XFA && m_iDocType != DOCTYPE_STATIC_XFA) return TRUE; if (m_pXFADocView == NULL) return TRUE; @@ -874,7 +874,7 @@ FX_BOOL CPDFXFA_Document::_OnBeforeNotifySumbit() { return TRUE; } void CPDFXFA_Document::_OnAfterNotifySumbit() { - if (m_iDocType != DOCTYPE_DYNIMIC_XFA && m_iDocType != DOCTYPE_STATIC_XFA) + if (m_iDocType != DOCTYPE_DYNAMIC_XFA && m_iDocType != DOCTYPE_STATIC_XFA) return; if (m_pXFADocView == NULL) return; diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp index b965387cc3..8b0db71ad0 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp @@ -93,7 +93,7 @@ FX_BOOL CPDFXFA_Page::LoadPage() { case DOCTYPE_STATIC_XFA: { return LoadPDFPage(); } - case DOCTYPE_DYNIMIC_XFA: { + case DOCTYPE_DYNAMIC_XFA: { return LoadXFAPageView(); } default: @@ -125,7 +125,7 @@ FX_FLOAT CPDFXFA_Page::GetPageWidth() { int nDocType = m_pDocument->GetDocType(); switch (nDocType) { - case DOCTYPE_DYNIMIC_XFA: { + case DOCTYPE_DYNAMIC_XFA: { if (m_pXFAPageView) { CFX_RectF rect; m_pXFAPageView->GetPageViewRect(rect); @@ -157,7 +157,7 @@ FX_FLOAT CPDFXFA_Page::GetPageHeight() { if (m_pPDFPage) return m_pPDFPage->GetPageHeight(); } break; - case DOCTYPE_DYNIMIC_XFA: { + case DOCTYPE_DYNAMIC_XFA: { if (m_pXFAPageView) { CFX_RectF rect; m_pXFAPageView->GetPageViewRect(rect); @@ -236,7 +236,7 @@ void CPDFXFA_Page::GetDisplayMatrix(CFX_AffineMatrix& matrix, int nDocType = m_pDocument->GetDocType(); switch (nDocType) { - case DOCTYPE_DYNIMIC_XFA: { + case DOCTYPE_DYNAMIC_XFA: { if (m_pXFAPageView) { CFX_Rect rect; rect.Set(xPos, yPos, xSize, ySize); diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index b05fd128a1..27cfe514c8 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -643,7 +643,7 @@ void CPDFSDK_PageView::PageView_OnDraw(CFX_RenderDevice* pDevice, return; #ifdef PDF_ENABLE_XFA - if (pPage->GetDocument()->GetDocType() == DOCTYPE_DYNIMIC_XFA) { + if (pPage->GetDocument()->GetDocType() == DOCTYPE_DYNAMIC_XFA) { CFX_Graphics gs; gs.Create(pDevice); CFX_RectF rectClip; @@ -792,7 +792,7 @@ FX_BOOL CPDFSDK_PageView::DeleteAnnot(CPDFSDK_Annot* pAnnot) { return FALSE; CPDFXFA_Page* pPage = pAnnot->GetPDFXFAPage(); if (!pPage || (pPage->GetDocument()->GetDocType() != DOCTYPE_STATIC_XFA && - pPage->GetDocument()->GetDocType() != DOCTYPE_DYNIMIC_XFA)) + pPage->GetDocument()->GetDocType() != DOCTYPE_DYNAMIC_XFA)) return FALSE; auto it = std::find(m_fxAnnotArray.begin(), m_fxAnnotArray.end(), pAnnot); @@ -990,7 +990,7 @@ void CPDFSDK_PageView::LoadFXAnnots() { SetLock(TRUE); m_page->AddRef(); - if (m_pSDKDoc->GetXFADocument()->GetDocType() == DOCTYPE_DYNIMIC_XFA) { + if (m_pSDKDoc->GetXFADocument()->GetDocType() == DOCTYPE_DYNAMIC_XFA) { IXFA_PageView* pageView = NULL; pageView = m_page->GetXFAPageView(); ASSERT(pageView != NULL); diff --git a/public/fpdf_formfill.h b/public/fpdf_formfill.h index d04911723d..297bd4af55 100644 --- a/public/fpdf_formfill.h +++ b/public/fpdf_formfill.h @@ -12,7 +12,7 @@ typedef void* FPDF_FORMHANDLE; #define DOCTYPE_PDF 0 // Normal pdf Document -#define DOCTYPE_DYNIMIC_XFA 1 // Dynimic xfa Document Type +#define DOCTYPE_DYNAMIC_XFA 1 // Dynamic xfa Document Type #define DOCTYPE_STATIC_XFA 2 // Static xfa Document Type // Exported Functions -- cgit v1.2.3