From 8ee5207f4f792295badd21f90727e8c810e7dbdf Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 4 Jan 2018 10:26:49 -0500 Subject: Make CXFA_WidgetData constructor protected This CL removes all the direct creation of CXFA_WidgetData elements and makes the constructor protected. Change-Id: I2e9aa11cab8c1e26f7cfa9fd32329f0841fab010 Reviewed-on: https://pdfium-review.googlesource.com/22251 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- fxjs/cfxjse_formcalc_context.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'fxjs') diff --git a/fxjs/cfxjse_formcalc_context.cpp b/fxjs/cfxjse_formcalc_context.cpp index f9d130a119..47d6ce6e4f 100644 --- a/fxjs/cfxjse_formcalc_context.cpp +++ b/fxjs/cfxjse_formcalc_context.cpp @@ -477,7 +477,7 @@ IFX_Locale* LocaleFromString(CXFA_Document* pDoc, CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject()); ASSERT(pThisNode); - return CXFA_WidgetData(pThisNode).GetLocale(); + return pThisNode->GetLocale(); } WideString FormatFromString(IFX_Locale* pLocale, @@ -1641,8 +1641,7 @@ void CFXJSE_FormCalcContext::Time2Num(CFXJSE_Value* pThis, if (localString.IsEmpty()) { CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject()); ASSERT(pThisNode); - CXFA_WidgetData widgetData(pThisNode); - pLocale = widgetData.GetLocale(); + pLocale = pThisNode->GetLocale(); } else { pLocale = pMgr->GetLocaleByName(WideString::FromUTF8(localString.AsStringView())); @@ -3768,8 +3767,7 @@ void CFXJSE_FormCalcContext::Format(CFXJSE_Value* pThis, CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject()); ASSERT(pThisNode); - CXFA_WidgetData widgetData(pThisNode); - IFX_Locale* pLocale = widgetData.GetLocale(); + IFX_Locale* pLocale = pThisNode->GetLocale(); uint32_t patternType; WideString wsPattern = WideString::FromUTF8(szPattern.AsStringView()); WideString wsValue = WideString::FromUTF8(szValue.AsStringView()); @@ -3951,8 +3949,7 @@ void CFXJSE_FormCalcContext::Parse(CFXJSE_Value* pThis, CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject()); ASSERT(pThisNode); - CXFA_WidgetData widgetData(pThisNode); - IFX_Locale* pLocale = widgetData.GetLocale(); + IFX_Locale* pLocale = pThisNode->GetLocale(); WideString wsPattern = WideString::FromUTF8(szPattern.AsStringView()); WideString wsValue = WideString::FromUTF8(szValue.AsStringView()); uint32_t patternType; -- cgit v1.2.3