summaryrefslogtreecommitdiff
path: root/xfa/src/fwl
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2016-02-22 14:08:33 -0800
committerLei Zhang <thestig@chromium.org>2016-02-22 14:08:33 -0800
commit2484d42c1c55dae09ec5886db11006c6d0be75f1 (patch)
treed3592a9110afebb4b5b5b6108dbc9ac2d1b29c49 /xfa/src/fwl
parent14b8cbe2b6ff8723cd734c5bd067121d12e5087f (diff)
downloadpdfium-2484d42c1c55dae09ec5886db11006c6d0be75f1.tar.xz
Fix return values in CFWL_FormImp::EndDoModal().
Also remove unused variable in CFWL_FormImpDelegate::OnProcessMessage(). R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1717383003 .
Diffstat (limited to 'xfa/src/fwl')
-rw-r--r--xfa/src/fwl/src/core/fwl_formimp.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/src/core/fwl_formimp.cpp
index d98d9d9ce6..dbb56f56f5 100644
--- a/xfa/src/fwl/src/core/fwl_formimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_formimp.cpp
@@ -414,11 +414,11 @@ FWL_ERR CFWL_FormImp::EndDoModal() {
m_pNoteLoop->EndModalLoop();
IFWL_NoteThread* pThread = GetOwnerThread();
if (!pThread)
- return NULL;
+ return FWL_ERR_Indefinite;
CFWL_NoteDriver* pDriver =
static_cast<CFWL_NoteDriver*>(pThread->GetNoteDriver());
if (!pDriver)
- return NULL;
+ return FWL_ERR_Indefinite;
pDriver->PopNoteLoop();
SetStates(FWL_WGTSTATE_Invisible, TRUE);
return FWL_ERR_Succeeded;
@@ -878,7 +878,6 @@ int32_t CFWL_FormImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
if (!pMessage)
return 0;
FX_DWORD dwMsgCode = pMessage->GetClassID();
- int32_t iRet = 1;
switch (dwMsgCode) {
case FWL_MSGHASH_Activate: {
m_pOwner->m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Deactivated;