summaryrefslogtreecommitdiff
path: root/xfa/fxfa/cxfa_widgetacc.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2018-01-22 21:41:57 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-01-22 21:41:57 +0000
commit9ccf4047a6f36e9c0863541437af7734a04ca676 (patch)
tree5be86df7221a3466a19ae3a89696ee25afa7b200 /xfa/fxfa/cxfa_widgetacc.cpp
parentbc948ce8d553422ef2a6285356e09e0261702583 (diff)
downloadpdfium-9ccf4047a6f36e9c0863541437af7734a04ca676.tar.xz
Remove GetLocale from CXFA_WidgetAcc
This CL removes the GetLocale method from CXFA_WidgetAcc and calls the CXFA_Node method directly. The node is always provided to CXFA_WidgetAcc so an asset is added and subsequent checks removed. Change-Id: I7495cd3a9678762e9e6fdecdf13104604d190280 Reviewed-on: https://pdfium-review.googlesource.com/23430 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_widgetacc.cpp')
-rw-r--r--xfa/fxfa/cxfa_widgetacc.cpp40
1 files changed, 16 insertions, 24 deletions
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp
index f10c2155a7..9c61697307 100644
--- a/xfa/fxfa/cxfa_widgetacc.cpp
+++ b/xfa/fxfa/cxfa_widgetacc.cpp
@@ -348,7 +348,9 @@ bool SplitDateTime(const WideString& wsDateTime,
} // namespace
-CXFA_WidgetAcc::CXFA_WidgetAcc(CXFA_Node* pNode) : m_pNode(pNode) {}
+CXFA_WidgetAcc::CXFA_WidgetAcc(CXFA_Node* pNode) : m_pNode(pNode) {
+ ASSERT(m_pNode);
+}
CXFA_WidgetAcc::~CXFA_WidgetAcc() = default;
@@ -1429,8 +1431,7 @@ void CXFA_WidgetAcc::SetCheckState(XFA_CHECKSTATE eCheckState, bool bNotify) {
}
pText = pText->GetNextSibling();
}
- if (m_pNode)
- m_pNode->SyncValue(wsContent, bNotify);
+ m_pNode->SyncValue(wsContent, bNotify);
return;
}
@@ -1535,10 +1536,8 @@ void CXFA_WidgetAcc::SetSelectedMemberByValue(const WideStringView& wsValue,
pNode->JSObject()->SetContent(wsChildValue, wsChildValue, bNotify,
bScriptModify, false);
}
- if (m_pNode) {
- m_pNode->JSObject()->SetContent(wsExclGroup, wsExclGroup, bNotify,
- bScriptModify, bSyncData);
- }
+ m_pNode->JSObject()->SetContent(wsExclGroup, wsExclGroup, bNotify,
+ bScriptModify, bSyncData);
}
CXFA_Node* CXFA_WidgetAcc::GetExclGroupFirstMember() {
@@ -2124,8 +2123,7 @@ int32_t CXFA_WidgetAcc::GetLeadDigits() {
bool CXFA_WidgetAcc::SetValue(XFA_VALUEPICTURE eValueType,
const WideString& wsValue) {
if (wsValue.IsEmpty()) {
- if (m_pNode)
- m_pNode->SyncValue(wsValue, true);
+ m_pNode->SyncValue(wsValue, true);
return true;
}
@@ -2143,7 +2141,7 @@ bool CXFA_WidgetAcc::SetValue(XFA_VALUEPICTURE eValueType,
XFA_Element eType = pNode->GetElementType();
if (!wsPicture.IsEmpty()) {
CXFA_LocaleMgr* pLocalMgr = m_pNode->GetDocument()->GetLocalMgr();
- IFX_Locale* pLocale = GetLocale();
+ IFX_Locale* pLocale = m_pNode->GetLocale();
CXFA_LocaleValue widgetValue = XFA_GetLocaleValue(GetNode());
bValidate =
widgetValue.ValidateValue(wsValue, wsPicture, pLocale, &wsPicture);
@@ -2164,10 +2162,8 @@ bool CXFA_WidgetAcc::SetValue(XFA_VALUEPICTURE eValueType,
bSyncData = true;
}
}
- if (eType != XFA_Element::NumericEdit || bSyncData) {
- if (m_pNode)
- m_pNode->SyncValue(wsNewText, true);
- }
+ if (eType != XFA_Element::NumericEdit || bSyncData)
+ m_pNode->SyncValue(wsNewText, true);
return bValidate;
}
@@ -2190,7 +2186,7 @@ WideString CXFA_WidgetAcc::GetPictureContent(XFA_VALUEPICTURE ePicture) {
}
}
- IFX_Locale* pLocale = GetLocale();
+ IFX_Locale* pLocale = m_pNode->GetLocale();
if (!pLocale)
return L"";
@@ -2222,7 +2218,7 @@ WideString CXFA_WidgetAcc::GetPictureContent(XFA_VALUEPICTURE ePicture) {
}
}
- IFX_Locale* pLocale = GetLocale();
+ IFX_Locale* pLocale = m_pNode->GetLocale();
if (!pLocale)
return L"";
@@ -2252,10 +2248,6 @@ WideString CXFA_WidgetAcc::GetPictureContent(XFA_VALUEPICTURE ePicture) {
return L"";
}
-IFX_Locale* CXFA_WidgetAcc::GetLocale() {
- return m_pNode ? m_pNode->GetLocale() : nullptr;
-}
-
WideString CXFA_WidgetAcc::GetValue(XFA_VALUEPICTURE eValueType) {
WideString wsValue = m_pNode->JSObject()->GetContent(false);
@@ -2279,7 +2271,7 @@ WideString CXFA_WidgetAcc::GetValue(XFA_VALUEPICTURE eValueType) {
} break;
case XFA_Element::NumericEdit:
if (eValueType != XFA_VALUEPICTURE_Raw && wsPicture.IsEmpty()) {
- IFX_Locale* pLocale = GetLocale();
+ IFX_Locale* pLocale = m_pNode->GetLocale();
if (eValueType == XFA_VALUEPICTURE_Display && pLocale)
wsValue = FormatNumStr(NormalizeNumStr(wsValue), pLocale);
}
@@ -2290,7 +2282,7 @@ WideString CXFA_WidgetAcc::GetValue(XFA_VALUEPICTURE eValueType) {
if (wsPicture.IsEmpty())
return wsValue;
- if (IFX_Locale* pLocale = GetLocale()) {
+ if (IFX_Locale* pLocale = m_pNode->GetLocale()) {
CXFA_LocaleValue widgetValue = XFA_GetLocaleValue(GetNode());
CXFA_LocaleMgr* pLocalMgr = m_pNode->GetDocument()->GetLocalMgr();
switch (widgetValue.GetType()) {
@@ -2330,7 +2322,7 @@ WideString CXFA_WidgetAcc::GetNormalizeDataValue(const WideString& wsValue) {
ASSERT(GetNode());
CXFA_LocaleMgr* pLocalMgr = GetNode()->GetDocument()->GetLocalMgr();
- IFX_Locale* pLocale = GetLocale();
+ IFX_Locale* pLocale = m_pNode->GetLocale();
CXFA_LocaleValue widgetValue = XFA_GetLocaleValue(GetNode());
if (widgetValue.ValidateValue(wsValue, wsPicture, pLocale, &wsPicture)) {
widgetValue = CXFA_LocaleValue(widgetValue.GetType(), wsValue, wsPicture,
@@ -2349,7 +2341,7 @@ WideString CXFA_WidgetAcc::GetFormatDataValue(const WideString& wsValue) {
return wsValue;
WideString wsFormattedValue = wsValue;
- if (IFX_Locale* pLocale = GetLocale()) {
+ if (IFX_Locale* pLocale = m_pNode->GetLocale()) {
ASSERT(GetNode());
CXFA_Value* pNodeValue =
GetNode()->GetChild<CXFA_Value>(0, XFA_Element::Value, false);