diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-11 14:34:56 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-11 14:34:56 +0000 |
| commit | 19835921655cd6f2086c7a741696906fc340abac (patch) | |
| tree | 7b71d4d2ae2985a9418160e41e47eeea4eff370e /xfa/fxfa/cxfa_widgetacc.cpp | |
| parent | 241752f3c188ed992a26618361e55b1d7f2be7cc (diff) | |
| download | pdfium-19835921655cd6f2086c7a741696906fc340abac.tar.xz | |
Rename GetFormValue to GetFormValueIfExists
This CL makes it clear that GetFormValue can return nullptr and fixes up
a few callsites as needed.
Change-Id: Id2e85b0956a678b5b338b9e2a4d32731fe6c4729
Reviewed-on: https://pdfium-review.googlesource.com/22690
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_widgetacc.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_widgetacc.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp index 5c2c168343..d7fa3ccde9 100644 --- a/xfa/fxfa/cxfa_widgetacc.cpp +++ b/xfa/fxfa/cxfa_widgetacc.cpp @@ -95,7 +95,7 @@ class CXFA_ImageLayoutData : public CXFA_WidgetLayoutData { if (m_pDIBitmap) return true; - CXFA_Value* value = pAcc->GetNode()->GetFormValue(); + CXFA_Value* value = pAcc->GetNode()->GetFormValueIfExists(); if (!value) return false; @@ -152,7 +152,7 @@ class CXFA_ImageEditData : public CXFA_FieldLayoutData { if (m_pDIBitmap) return true; - CXFA_Value* value = pAcc->GetNode()->GetFormValue(); + CXFA_Value* value = pAcc->GetNode()->GetFormValueIfExists(); if (!value) return false; @@ -439,7 +439,7 @@ void CXFA_WidgetAcc::ResetData() { void CXFA_WidgetAcc::SetImageEdit(const WideString& wsContentType, const WideString& wsHref, const WideString& wsData) { - CXFA_Value* formValue = m_pNode->GetFormValue(); + CXFA_Value* formValue = m_pNode->GetFormValueIfExists(); CXFA_Image* image = formValue ? formValue->GetImage() : nullptr; if (image) { image->SetContentType(WideString(wsContentType)); @@ -451,7 +451,8 @@ void CXFA_WidgetAcc::SetImageEdit(const WideString& wsContentType, CXFA_Node* pBind = m_pNode->GetBindData(); if (!pBind) { - image->SetTransferEncoding(XFA_AttributeEnum::Base64); + if (image) + image->SetTransferEncoding(XFA_AttributeEnum::Base64); return; } pBind->JSObject()->SetCData(XFA_Attribute::ContentType, wsContentType, false, |