| Index: xfa/fgas/localization/fgas_localeimp.h
|
| diff --git a/xfa/fgas/localization/fgas_localeimp.h b/xfa/fgas/localization/fgas_localeimp.h
|
| index 969fe6b625a60532d911f271ea52ce34a27a7708..66f1767c5cf4af1da3de0c9ddafc09338979b2db 100644
|
| --- a/xfa/fgas/localization/fgas_localeimp.h
|
| +++ b/xfa/fgas/localization/fgas_localeimp.h
|
| @@ -13,7 +13,7 @@ class CFX_LCNumeric;
|
|
|
| class CFX_FormatString {
|
| public:
|
| - CFX_FormatString(IFX_LocaleMgr* pLocaleMgr, FX_BOOL bUseLCID);
|
| + CFX_FormatString(IFX_LocaleMgr* pLocaleMgr, bool bUseLCID);
|
|
|
| void Release() { delete this; }
|
|
|
| @@ -22,44 +22,44 @@ class CFX_FormatString {
|
| FX_LOCALECATEGORY GetCategory(const CFX_WideString& wsPattern);
|
| uint16_t GetLCID(const CFX_WideString& wsPattern);
|
| CFX_WideString GetLocaleName(const CFX_WideString& wsPattern);
|
| - FX_BOOL ParseText(const CFX_WideString& wsSrcText,
|
| - const CFX_WideString& wsPattern,
|
| - CFX_WideString& wsValue);
|
| - FX_BOOL ParseNum(const CFX_WideString& wsSrcNum,
|
| - const CFX_WideString& wsPattern,
|
| - FX_FLOAT& fValue);
|
| - FX_BOOL ParseNum(const CFX_WideString& wsSrcNum,
|
| - const CFX_WideString& wsPattern,
|
| - CFX_WideString& wsValue);
|
| - FX_BOOL ParseDateTime(const CFX_WideString& wsSrcDateTime,
|
| - const CFX_WideString& wsPattern,
|
| - FX_DATETIMETYPE eDateTimeType,
|
| - CFX_Unitime& dtValue);
|
| - FX_BOOL ParseZero(const CFX_WideString& wsSrcText,
|
| - const CFX_WideString& wsPattern);
|
| - FX_BOOL ParseNull(const CFX_WideString& wsSrcText,
|
| - const CFX_WideString& wsPattern);
|
| - FX_BOOL FormatText(const CFX_WideString& wsSrcText,
|
| + bool ParseText(const CFX_WideString& wsSrcText,
|
| + const CFX_WideString& wsPattern,
|
| + CFX_WideString& wsValue);
|
| + bool ParseNum(const CFX_WideString& wsSrcNum,
|
| + const CFX_WideString& wsPattern,
|
| + FX_FLOAT& fValue);
|
| + bool ParseNum(const CFX_WideString& wsSrcNum,
|
| + const CFX_WideString& wsPattern,
|
| + CFX_WideString& wsValue);
|
| + bool ParseDateTime(const CFX_WideString& wsSrcDateTime,
|
| const CFX_WideString& wsPattern,
|
| - CFX_WideString& wsOutput);
|
| - FX_BOOL FormatNum(const CFX_WideString& wsSrcNum,
|
| - const CFX_WideString& wsPattern,
|
| - CFX_WideString& wsOutput);
|
| - FX_BOOL FormatNum(FX_FLOAT fNum,
|
| - const CFX_WideString& wsPattern,
|
| - CFX_WideString& wsOutput);
|
| - FX_BOOL FormatDateTime(const CFX_WideString& wsSrcDateTime,
|
| - const CFX_WideString& wsPattern,
|
| - CFX_WideString& wsOutput);
|
| - FX_BOOL FormatDateTime(const CFX_WideString& wsSrcDateTime,
|
| - const CFX_WideString& wsPattern,
|
| - CFX_WideString& wsOutput,
|
| - FX_DATETIMETYPE eDateTimeType);
|
| - FX_BOOL FormatDateTime(const CFX_Unitime& dt,
|
| - const CFX_WideString& wsPattern,
|
| - CFX_WideString& wsOutput);
|
| - FX_BOOL FormatZero(const CFX_WideString& wsPattern, CFX_WideString& wsOutput);
|
| - FX_BOOL FormatNull(const CFX_WideString& wsPattern, CFX_WideString& wsOutput);
|
| + FX_DATETIMETYPE eDateTimeType,
|
| + CFX_Unitime& dtValue);
|
| + bool ParseZero(const CFX_WideString& wsSrcText,
|
| + const CFX_WideString& wsPattern);
|
| + bool ParseNull(const CFX_WideString& wsSrcText,
|
| + const CFX_WideString& wsPattern);
|
| + bool FormatText(const CFX_WideString& wsSrcText,
|
| + const CFX_WideString& wsPattern,
|
| + CFX_WideString& wsOutput);
|
| + bool FormatNum(const CFX_WideString& wsSrcNum,
|
| + const CFX_WideString& wsPattern,
|
| + CFX_WideString& wsOutput);
|
| + bool FormatNum(FX_FLOAT fNum,
|
| + const CFX_WideString& wsPattern,
|
| + CFX_WideString& wsOutput);
|
| + bool FormatDateTime(const CFX_WideString& wsSrcDateTime,
|
| + const CFX_WideString& wsPattern,
|
| + CFX_WideString& wsOutput);
|
| + bool FormatDateTime(const CFX_WideString& wsSrcDateTime,
|
| + const CFX_WideString& wsPattern,
|
| + CFX_WideString& wsOutput,
|
| + FX_DATETIMETYPE eDateTimeType);
|
| + bool FormatDateTime(const CFX_Unitime& dt,
|
| + const CFX_WideString& wsPattern,
|
| + CFX_WideString& wsOutput);
|
| + bool FormatZero(const CFX_WideString& wsPattern, CFX_WideString& wsOutput);
|
| + bool FormatNull(const CFX_WideString& wsPattern, CFX_WideString& wsOutput);
|
|
|
| protected:
|
| ~CFX_FormatString();
|
| @@ -71,12 +71,12 @@ class CFX_FormatString {
|
| int32_t& iDotIndex,
|
| uint32_t& dwStyle,
|
| CFX_WideString& wsPurgePattern);
|
| - FX_BOOL FormatStrNum(const CFX_WideStringC& wsInputNum,
|
| + bool FormatStrNum(const CFX_WideStringC& wsInputNum,
|
| + const CFX_WideString& wsPattern,
|
| + CFX_WideString& wsOutput);
|
| + bool FormatLCNumeric(CFX_LCNumeric& lcNum,
|
| const CFX_WideString& wsPattern,
|
| CFX_WideString& wsOutput);
|
| - FX_BOOL FormatLCNumeric(CFX_LCNumeric& lcNum,
|
| - const CFX_WideString& wsPattern,
|
| - CFX_WideString& wsOutput);
|
| FX_DATETIMETYPE GetDateTimeFormat(const CFX_WideString& wsPattern,
|
| IFX_Locale*& pLocale,
|
| CFX_WideString& wsDatePattern,
|
| @@ -84,7 +84,7 @@ class CFX_FormatString {
|
| IFX_Locale* GetPatternLocale(const CFX_WideString& wsLocale);
|
|
|
| IFX_LocaleMgr* m_pLocaleMgr;
|
| - FX_BOOL m_bUseLCID;
|
| + bool m_bUseLCID;
|
| };
|
|
|
| #endif // XFA_FGAS_LOCALIZATION_FGAS_LOCALEIMP_H_
|
|
|