diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-07-19 10:27:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-07-19 10:27:12 -0700 |
| commit | eea31b75a11215aa72a9845d47c38d2ce1edd4f7 (patch) | |
| tree | f6ef06a0c323a0a842981da595144fc8d2085d86 /xfa/fxfa/app/xfa_ffnotify.cpp | |
| parent | 3617751cea45fd636d58f535a662337fcea40c4a (diff) | |
| download | pdfium-eea31b75a11215aa72a9845d47c38d2ce1edd4f7.tar.xz | |
Cleanup CXFA_Documentchromium/2803chromium/2802
Removing unused XFA_LAYOUTRESULT, cleanup unused parameters, convert XFA_DocFlag
to an enum from defines and make the constructor explicit.
Review-Url: https://codereview.chromium.org/2166433002
Diffstat (limited to 'xfa/fxfa/app/xfa_ffnotify.cpp')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffnotify.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/xfa/fxfa/app/xfa_ffnotify.cpp b/xfa/fxfa/app/xfa_ffnotify.cpp index be8268a9d4..09003f023c 100644 --- a/xfa/fxfa/app/xfa_ffnotify.cpp +++ b/xfa/fxfa/app/xfa_ffnotify.cpp @@ -174,20 +174,19 @@ void CXFA_FFNotify::StartFieldDrawLayout(CXFA_Node* pItem, FX_FLOAT& fCalcWidth, FX_FLOAT& fCalcHeight) { CXFA_WidgetAcc* pAcc = static_cast<CXFA_WidgetAcc*>(pItem->GetWidgetData()); - if (!pAcc) { + if (!pAcc) return; - } + pAcc->StartWidgetLayout(fCalcWidth, fCalcHeight); } + FX_BOOL CXFA_FFNotify::FindSplitPos(CXFA_Node* pItem, int32_t iBlockIndex, FX_FLOAT& fCalcHeightPos) { CXFA_WidgetAcc* pAcc = static_cast<CXFA_WidgetAcc*>(pItem->GetWidgetData()); - if (!pAcc) { - return FALSE; - } - return (XFA_LAYOUTRESULT)pAcc->FindSplitPos(iBlockIndex, fCalcHeightPos); + return pAcc && pAcc->FindSplitPos(iBlockIndex, fCalcHeightPos); } + FX_BOOL CXFA_FFNotify::RunScript(CXFA_Node* pScript, CXFA_Node* pFormItem) { FX_BOOL bRet = FALSE; CXFA_FFDocView* pDocView = m_pDoc->GetDocView(); |