From 9ad342b60490b9e88896aaf2eb7fb8f7bfa73e5a Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 29 Mar 2017 11:02:17 -0400 Subject: Return values instead of out params MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This CL updates the IFX_Locale code and subclasses to return CFX_WideStrings instead of taking out params. Change-Id: Id03499c68161e809607e73b9d8ec778e24631845 Reviewed-on: https://pdfium-review.googlesource.com/3252 Reviewed-by: Nicolás Peña Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_nodelocale.h | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_nodelocale.h') diff --git a/xfa/fxfa/parser/cxfa_nodelocale.h b/xfa/fxfa/parser/cxfa_nodelocale.h index db3b2303e7..0059d19888 100644 --- a/xfa/fxfa/parser/cxfa_nodelocale.h +++ b/xfa/fxfa/parser/cxfa_nodelocale.h @@ -21,27 +21,20 @@ class CXFA_NodeLocale : public IFX_Locale { // IFX_Locale CFX_WideString GetName() const override; - void GetNumbericSymbol(FX_LOCALENUMSYMBOL eType, - CFX_WideString& wsNumSymbol) const override; - - void GetDateTimeSymbols(CFX_WideString& wsDtSymbol) const override; - void GetMonthName(int32_t nMonth, - CFX_WideString& wsMonthName, - bool bAbbr = true) const override; - void GetDayName(int32_t nWeek, - CFX_WideString& wsDayName, - bool bAbbr = true) const override; - void GetMeridiemName(CFX_WideString& wsMeridiemName, - bool bAM = true) const override; - void GetTimeZone(FX_TIMEZONE* tz) const override; - void GetEraName(CFX_WideString& wsEraName, bool bAD = true) const override; - - void GetDatePattern(FX_LOCALEDATETIMESUBCATEGORY eType, - CFX_WideString& wsPattern) const override; - void GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY eType, - CFX_WideString& wsPattern) const override; - void GetNumPattern(FX_LOCALENUMSUBCATEGORY eType, - CFX_WideString& wsPattern) const override; + CFX_WideString GetNumbericSymbol(FX_LOCALENUMSYMBOL eType) const override; + + CFX_WideString GetDateTimeSymbols() const override; + CFX_WideString GetMonthName(int32_t nMonth, bool bAbbr) const override; + CFX_WideString GetDayName(int32_t nWeek, bool bAbbr) const override; + CFX_WideString GetMeridiemName(bool bAM) const override; + FX_TIMEZONE GetTimeZone() const override; + CFX_WideString GetEraName(bool bAD) const override; + + CFX_WideString GetDatePattern( + FX_LOCALEDATETIMESUBCATEGORY eType) const override; + CFX_WideString GetTimePattern( + FX_LOCALEDATETIMESUBCATEGORY eType) const override; + CFX_WideString GetNumPattern(FX_LOCALENUMSUBCATEGORY eType) const override; private: CXFA_Node* GetNodeByName(CXFA_Node* pParent, -- cgit v1.2.3