summaryrefslogtreecommitdiff
path: root/fpdfsdk/src/fsdk_mgr.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-11-24 13:33:57 -0800
committerTom Sepez <tsepez@chromium.org>2015-11-24 13:33:57 -0800
commit540c436dc8e7d7b700b448acc8536f5cf68d4b74 (patch)
treebff6a2297a280b39753d93b64ec61d6c9459b50a /fpdfsdk/src/fsdk_mgr.cpp
parented19d211f96f47e06dc1b597c5a054e17d7e160d (diff)
downloadpdfium-540c436dc8e7d7b700b448acc8536f5cf68d4b74.tar.xz
XFA: more underlying type changes to match master
R=thestig@chromium.org Review URL: https://codereview.chromium.org/1474663004 .
Diffstat (limited to 'fpdfsdk/src/fsdk_mgr.cpp')
-rw-r--r--fpdfsdk/src/fsdk_mgr.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp
index 69432a4af1..b05fd128a1 100644
--- a/fpdfsdk/src/fsdk_mgr.cpp
+++ b/fpdfsdk/src/fsdk_mgr.cpp
@@ -530,16 +530,17 @@ FX_BOOL CPDFSDK_Document::SetFocusAnnot(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) {
if (m_pFocusAnnot == pAnnot)
return TRUE;
- CPDFSDK_Annot* pLastFocusAnnot = m_pFocusAnnot;
-
if (m_pFocusAnnot) {
if (!KillFocusAnnot(nFlag))
return FALSE;
}
- CPDFSDK_PageView* pPageView = NULL;
- if (pAnnot)
- pPageView = pAnnot->GetPageView();
- if (pAnnot && pPageView->IsValid()) {
+
+ if (!pAnnot)
+ return FALSE;
+
+ CPDFSDK_Annot* pLastFocusAnnot = m_pFocusAnnot;
+ CPDFSDK_PageView* pPageView = pAnnot->GetPageView();
+ if (pPageView && pPageView->IsValid()) {
CPDFSDK_AnnotHandlerMgr* pAnnotHandler = m_pEnv->GetAnnotHandlerMgr();
if (!m_pFocusAnnot) {
if (!pAnnotHandler->Annot_OnChangeFocus(pAnnot, pLastFocusAnnot))
@@ -589,8 +590,7 @@ void CPDFSDK_Document::OnCloseDocument() {
}
FX_BOOL CPDFSDK_Document::GetPermissions(int nFlag) {
- FX_DWORD dwPermissions = m_pDoc->GetPDFDoc()->GetUserPermissions();
- return dwPermissions & nFlag;
+ return GetPDFDocument()->GetUserPermissions() & nFlag;
}
IJS_Runtime* CPDFSDK_Document::GetJsRuntime() {
@@ -604,7 +604,7 @@ CFX_WideString CPDFSDK_Document::GetPath() {
}
CPDFSDK_PageView::CPDFSDK_PageView(CPDFSDK_Document* pSDKDoc,
- CPDFXFA_Page* page)
+ UnderlyingPageType* page)
: m_page(page),
m_pSDKDoc(pSDKDoc),
m_CaptureWidget(nullptr),