From 64204f591bc27976a7123ec5a88558542486bb3f Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 8 Jan 2018 15:53:54 -0500 Subject: Convert XFA_GetLocaleValue to accept a CXFA_Node This CL changes XFA_GetLocaleValue to accept a CXFA_Node instead of a CXFA_WidgetAcc. Change-Id: Id304fd8dafcc6e644058230289e497525702fa79 Reviewed-on: https://pdfium-review.googlesource.com/22470 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- xfa/fxfa/cxfa_widgetacc.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/cxfa_widgetacc.cpp') diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp index f3caea44f2..da552e1a19 100644 --- a/xfa/fxfa/cxfa_widgetacc.cpp +++ b/xfa/fxfa/cxfa_widgetacc.cpp @@ -580,7 +580,7 @@ int32_t CXFA_WidgetAcc::ProcessFormatTestValidate(CXFA_FFDocView* docView, if (!pLocale) return XFA_EVENTERROR_NotExist; - CXFA_LocaleValue lcValue = XFA_GetLocaleValue(this); + CXFA_LocaleValue lcValue = XFA_GetLocaleValue(GetNode()); if (!lcValue.ValidateValue(lcValue.GetValue(), wsPicture, pLocale, nullptr)) { IXFA_AppProvider* pAppProvider = @@ -2745,7 +2745,7 @@ bool CXFA_WidgetAcc::SetValue(XFA_VALUEPICTURE eValueType, if (!wsPicture.IsEmpty()) { CXFA_LocaleMgr* pLocalMgr = m_pNode->GetDocument()->GetLocalMgr(); IFX_Locale* pLocale = GetLocale(); - CXFA_LocaleValue widgetValue = XFA_GetLocaleValue(this); + CXFA_LocaleValue widgetValue = XFA_GetLocaleValue(GetNode()); bValidate = widgetValue.ValidateValue(wsValue, wsPicture, pLocale, &wsPicture); if (bValidate) { @@ -2777,7 +2777,7 @@ WideString CXFA_WidgetAcc::GetPictureContent(XFA_VALUEPICTURE ePicture) { if (ePicture == XFA_VALUEPICTURE_Raw) return L""; - CXFA_LocaleValue widgetValue = XFA_GetLocaleValue(this); + CXFA_LocaleValue widgetValue = XFA_GetLocaleValue(GetNode()); switch (ePicture) { case XFA_VALUEPICTURE_Display: { if (CXFA_Format* pFormat = @@ -2892,7 +2892,7 @@ WideString CXFA_WidgetAcc::GetValue(XFA_VALUEPICTURE eValueType) { return wsValue; if (IFX_Locale* pLocale = GetLocale()) { - CXFA_LocaleValue widgetValue = XFA_GetLocaleValue(this); + CXFA_LocaleValue widgetValue = XFA_GetLocaleValue(GetNode()); CXFA_LocaleMgr* pLocalMgr = m_pNode->GetDocument()->GetLocalMgr(); switch (widgetValue.GetType()) { case XFA_VT_DATE: { @@ -2932,7 +2932,7 @@ WideString CXFA_WidgetAcc::GetNormalizeDataValue(const WideString& wsValue) { ASSERT(GetNode()); CXFA_LocaleMgr* pLocalMgr = GetNode()->GetDocument()->GetLocalMgr(); IFX_Locale* pLocale = GetLocale(); - CXFA_LocaleValue widgetValue = XFA_GetLocaleValue(this); + CXFA_LocaleValue widgetValue = XFA_GetLocaleValue(GetNode()); if (widgetValue.ValidateValue(wsValue, wsPicture, pLocale, &wsPicture)) { widgetValue = CXFA_LocaleValue(widgetValue.GetType(), wsValue, wsPicture, pLocale, pLocalMgr); -- cgit v1.2.3