summaryrefslogtreecommitdiff
path: root/xfa/fxfa/cxfa_widgetacc.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-07 21:44:00 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-07 21:44:00 +0000
commit58629a0e49e4ebfb0a0171a4203d2fab4af63165 (patch)
treee25f5af0a5b3993dcc7ae0ed730f8c5c1fb1445c /xfa/fxfa/cxfa_widgetacc.cpp
parent255e61ed20e42917e0055710fb5be56b2ad40afc (diff)
downloadpdfium-58629a0e49e4ebfb0a0171a4203d2fab4af63165.tar.xz
Rename CXFA_Value to CXFA_ValueDatachromium/3262
This CL renames CXFA_Value to CXFA_ValueData to show it's part of the data hierarchy. Change-Id: I4693234f503903a2c11d76a56dbbb6de5f0c3718 Reviewed-on: https://pdfium-review.googlesource.com/18018 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_widgetacc.cpp')
-rw-r--r--xfa/fxfa/cxfa_widgetacc.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp
index 1e005791a2..07745eabe6 100644
--- a/xfa/fxfa/cxfa_widgetacc.cpp
+++ b/xfa/fxfa/cxfa_widgetacc.cpp
@@ -77,11 +77,11 @@ class CXFA_ImageLayoutData : public CXFA_WidgetLayoutData {
if (m_pDIBitmap)
return true;
- CXFA_Value value = pAcc->GetFormValue();
- if (!value)
+ CXFA_ValueData valueData = pAcc->GetFormValueData();
+ if (!valueData)
return false;
- CXFA_ImageData imageData = value.GetImageData();
+ CXFA_ImageData imageData = valueData.GetImageData();
if (!imageData)
return false;
@@ -137,11 +137,11 @@ class CXFA_ImageEditData : public CXFA_FieldLayoutData {
if (m_pDIBitmap)
return true;
- CXFA_Value value = pAcc->GetFormValue();
- if (!value)
+ CXFA_ValueData valueData = pAcc->GetFormValueData();
+ if (!valueData)
return false;
- CXFA_ImageData imageData = value.GetImageData();
+ CXFA_ImageData imageData = valueData.GetImageData();
CXFA_FFDoc* pFFDoc = pAcc->GetDoc();
pAcc->SetImageEditImage(XFA_LoadImageData(pFFDoc, &imageData, m_bNamedImage,
m_iImageXDpi, m_iImageYDpi));
@@ -178,8 +178,8 @@ void CXFA_WidgetAcc::ResetData() {
XFA_Element eUIType = GetUIType();
switch (eUIType) {
case XFA_Element::ImageEdit: {
- CXFA_Value imageValue = GetDefaultValue();
- CXFA_ImageData imageData = imageValue.GetImageData();
+ CXFA_ValueData imageValueData = GetDefaultValueData();
+ CXFA_ImageData imageData = imageValueData.GetImageData();
WideString wsContentType, wsHref;
if (imageData) {
imageData.GetContent(wsValue);
@@ -199,9 +199,9 @@ void CXFA_WidgetAcc::ResetData() {
if (!pAcc)
continue;
- CXFA_Value defValue(nullptr);
- if (wsValue.IsEmpty() && (defValue = pAcc->GetDefaultValue())) {
- defValue.GetChildValueContent(wsValue);
+ CXFA_ValueData defValueData(nullptr);
+ if (wsValue.IsEmpty() && (defValueData = pAcc->GetDefaultValueData())) {
+ defValueData.GetChildValueContent(wsValue);
SetValue(wsValue, XFA_VALUEPICTURE_Raw);
pAcc->SetValue(wsValue, XFA_VALUEPICTURE_Raw);
} else {
@@ -226,8 +226,8 @@ void CXFA_WidgetAcc::ResetData() {
case XFA_Element::ChoiceList:
ClearAllSelections();
default:
- if (CXFA_Value defValue = GetDefaultValue())
- defValue.GetChildValueContent(wsValue);
+ if (CXFA_ValueData defValueData = GetDefaultValueData())
+ defValueData.GetChildValueContent(wsValue);
SetValue(wsValue, XFA_VALUEPICTURE_Raw);
break;
@@ -237,7 +237,7 @@ void CXFA_WidgetAcc::ResetData() {
void CXFA_WidgetAcc::SetImageEdit(const WideString& wsContentType,
const WideString& wsHref,
const WideString& wsData) {
- CXFA_ImageData imageData = GetFormValue().GetImageData();
+ CXFA_ImageData imageData = GetFormValueData().GetImageData();
if (imageData) {
imageData.SetContentType(WideString(wsContentType));
imageData.SetHref(wsHref);
@@ -505,7 +505,7 @@ WideString CXFA_WidgetAcc::GetValidateCaptionName(bool bVersionFlag) {
if (!bVersionFlag) {
if (CXFA_CaptionData captionData = GetCaptionData()) {
- if (CXFA_Value capValue = captionData.GetValue()) {
+ if (CXFA_ValueData capValue = captionData.GetValueData()) {
if (CXFA_TextData captionTextData = capValue.GetTextData())
captionTextData.GetContent(wsCaptionName);
}