summaryrefslogtreecommitdiff
path: root/fpdfsdk/fsdk_mgr.cpp
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-06-08 06:11:20 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-08 06:11:20 -0700
commitd3be111cac2bb20e1917b3fae2102e742bb7efdb (patch)
treed985aa96a5aaaf356d32f28bbcb0cc6b470d4b05 /fpdfsdk/fsdk_mgr.cpp
parenta431e238ee42025cce44c3a76dd07c470d7f51ec (diff)
downloadpdfium-d3be111cac2bb20e1917b3fae2102e742bb7efdb.tar.xz
Fix GetPageIndex() for dynamic XFA documents.
BUG=614211 Review-Url: https://codereview.chromium.org/2045013004
Diffstat (limited to 'fpdfsdk/fsdk_mgr.cpp')
-rw-r--r--fpdfsdk/fsdk_mgr.cpp44
1 files changed, 34 insertions, 10 deletions
diff --git a/fpdfsdk/fsdk_mgr.cpp b/fpdfsdk/fsdk_mgr.cpp
index 835439394d..c4c0384b44 100644
--- a/fpdfsdk/fsdk_mgr.cpp
+++ b/fpdfsdk/fsdk_mgr.cpp
@@ -34,11 +34,17 @@
#include <ctime>
#endif
+namespace {
+
+// NOTE: |bsUTF16LE| must outlive the use of the result. Care must be taken
+// since modifying the result would impact |bsUTF16LE|.
FPDF_WIDESTRING AsFPDFWideString(CFX_ByteString* bsUTF16LE) {
return reinterpret_cast<FPDF_WIDESTRING>(
bsUTF16LE->GetBuffer(bsUTF16LE->GetLength()));
}
+} // namespace
+
CPDFDoc_Environment::CPDFDoc_Environment(UnderlyingDocumentType* pDoc,
FPDF_FORMFILLINFO* pFFinfo)
: m_pInfo(pFFinfo), m_pSDKDoc(nullptr), m_pUnderlyingDoc(pDoc) {
@@ -988,19 +994,26 @@ void CPDFSDK_PageView::UpdateView(CPDFSDK_Annot* pAnnot) {
rcWindow.bottom);
}
-int CPDFSDK_PageView::GetPageIndex() {
- if (m_page) {
+int CPDFSDK_PageView::GetPageIndex() const {
+ if (!m_page)
+ return -1;
+
#ifdef PDF_ENABLE_XFA
- CPDF_Dictionary* pDic = m_page->GetPDFPage()->m_pFormDict;
-#else // PDF_ENABLE_XFA
- CPDF_Dictionary* pDic = m_page->m_pFormDict;
-#endif // PDF_ENABLE_XFA
- CPDF_Document* pDoc = m_pSDKDoc->GetPDFDocument();
- if (pDoc && pDic) {
- return pDoc->GetPageIndex(pDic->GetObjNum());
+ int nDocType = m_page->GetDocument()->GetDocType();
+ switch (nDocType) {
+ case DOCTYPE_DYNAMIC_XFA: {
+ CXFA_FFPageView* pPageView = m_page->GetXFAPageView();
+ return pPageView ? pPageView->GetPageIndex() : -1;
}
+ case DOCTYPE_STATIC_XFA:
+ case DOCTYPE_PDF:
+ return GetPageIndexForStaticPDF();
+ default:
+ return -1;
}
- return -1;
+#else // PDF_ENABLE_XFA
+ return GetPageIndexForStaticPDF();
+#endif // PDF_ENABLE_XFA
}
bool CPDFSDK_PageView::IsValidAnnot(const CPDF_Annot* p) const {
@@ -1022,3 +1035,14 @@ CPDFSDK_Annot* CPDFSDK_PageView::GetFocusAnnot() {
}
return nullptr;
}
+
+int CPDFSDK_PageView::GetPageIndexForStaticPDF() const {
+#ifdef PDF_ENABLE_XFA
+ CPDF_Page* pPage = m_page->GetPDFPage();
+#else // PDF_ENABLE_XFA
+ CPDF_Page* pPage = m_page;
+#endif // PDF_ENABLE_XFA
+ CPDF_Dictionary* pDict = pPage->m_pFormDict;
+ CPDF_Document* pDoc = m_pSDKDoc->GetPDFDocument();
+ return (pDoc && pDict) ? pDoc->GetPageIndex(pDict->GetObjNum()) : -1;
+}