| Index: xfa/fxfa/parser/xfa_localevalue.h
|
| diff --git a/xfa/fxfa/parser/xfa_localevalue.h b/xfa/fxfa/parser/xfa_localevalue.h
|
| index f278c071051013ee93080773dfd433989233d23b..dbc3513a3f34edb986fde2825772c1753c65e0a6 100644
|
| --- a/xfa/fxfa/parser/xfa_localevalue.h
|
| +++ b/xfa/fxfa/parser/xfa_localevalue.h
|
| @@ -41,32 +41,30 @@ class CXFA_LocaleValue {
|
| ~CXFA_LocaleValue();
|
| CXFA_LocaleValue& operator=(const CXFA_LocaleValue& value);
|
|
|
| - FX_BOOL ValidateValue(const CFX_WideString& wsValue,
|
| - const CFX_WideString& wsPattern,
|
| - IFX_Locale* pLocale,
|
| - CFX_WideString* pMatchFormat = nullptr);
|
| - FX_BOOL FormatPatterns(CFX_WideString& wsResult,
|
| - const CFX_WideString& wsFormat,
|
| - IFX_Locale* pLocale,
|
| - XFA_VALUEPICTURE eValueType) const;
|
| - FX_BOOL FormatSinglePattern(CFX_WideString& wsResult,
|
| - const CFX_WideString& wsFormat,
|
| - IFX_Locale* pLocale,
|
| - XFA_VALUEPICTURE eValueType) const;
|
| - FX_BOOL ValidateCanonicalValue(const CFX_WideString& wsValue,
|
| - uint32_t dwVType);
|
| - FX_BOOL ValidateCanonicalDate(const CFX_WideString& wsDate,
|
| - CFX_Unitime& unDate);
|
| - FX_BOOL ValidateCanonicalTime(const CFX_WideString& wsTime);
|
| - FX_BOOL ValidateCanonicalDateTime(const CFX_WideString& wsDateTime);
|
| + bool ValidateValue(const CFX_WideString& wsValue,
|
| + const CFX_WideString& wsPattern,
|
| + IFX_Locale* pLocale,
|
| + CFX_WideString* pMatchFormat = nullptr);
|
| + bool FormatPatterns(CFX_WideString& wsResult,
|
| + const CFX_WideString& wsFormat,
|
| + IFX_Locale* pLocale,
|
| + XFA_VALUEPICTURE eValueType) const;
|
| + bool FormatSinglePattern(CFX_WideString& wsResult,
|
| + const CFX_WideString& wsFormat,
|
| + IFX_Locale* pLocale,
|
| + XFA_VALUEPICTURE eValueType) const;
|
| + bool ValidateCanonicalValue(const CFX_WideString& wsValue, uint32_t dwVType);
|
| + bool ValidateCanonicalDate(const CFX_WideString& wsDate, CFX_Unitime& unDate);
|
| + bool ValidateCanonicalTime(const CFX_WideString& wsTime);
|
| + bool ValidateCanonicalDateTime(const CFX_WideString& wsDateTime);
|
| void GetNumbericFormat(CFX_WideString& wsFormat,
|
| int32_t nIntLen,
|
| int32_t nDecLen,
|
| - FX_BOOL bSign = TRUE);
|
| - FX_BOOL ValidateNumericTemp(CFX_WideString& wsNumeric,
|
| - CFX_WideString& wsFormat,
|
| - IFX_Locale* pLocale = nullptr,
|
| - int32_t* pos = nullptr);
|
| + bool bSign = true);
|
| + bool ValidateNumericTemp(CFX_WideString& wsNumeric,
|
| + CFX_WideString& wsFormat,
|
| + IFX_Locale* pLocale = nullptr,
|
| + int32_t* pos = nullptr);
|
|
|
| CFX_WideString GetValue() const;
|
| uint32_t GetType() const;
|
| @@ -77,38 +75,38 @@ class CXFA_LocaleValue {
|
| CFX_Unitime GetDate() const;
|
| CFX_Unitime GetTime() const;
|
| CFX_Unitime GetDateTime() const;
|
| - FX_BOOL SetText(const CFX_WideString& wsText);
|
| - FX_BOOL SetText(const CFX_WideString& wsText,
|
| - const CFX_WideString& wsFormat,
|
| - IFX_Locale* pLocale);
|
| - FX_BOOL SetNum(FX_FLOAT fNum);
|
| - FX_BOOL SetNum(const CFX_WideString& wsNum,
|
| - const CFX_WideString& wsFormat,
|
| - IFX_Locale* pLocale);
|
| - FX_BOOL SetDate(const CFX_Unitime& d);
|
| - FX_BOOL SetDate(const CFX_WideString& wsDate,
|
| - const CFX_WideString& wsFormat,
|
| - IFX_Locale* pLocale);
|
| - FX_BOOL SetTime(const CFX_Unitime& t);
|
| - FX_BOOL SetTime(const CFX_WideString& wsTime,
|
| - const CFX_WideString& wsFormat,
|
| - IFX_Locale* pLocale);
|
| - FX_BOOL SetDateTime(const CFX_Unitime& dt);
|
| - FX_BOOL SetDateTime(const CFX_WideString& wsDateTime,
|
| - const CFX_WideString& wsFormat,
|
| - IFX_Locale* pLocale);
|
| + bool SetText(const CFX_WideString& wsText);
|
| + bool SetText(const CFX_WideString& wsText,
|
| + const CFX_WideString& wsFormat,
|
| + IFX_Locale* pLocale);
|
| + bool SetNum(FX_FLOAT fNum);
|
| + bool SetNum(const CFX_WideString& wsNum,
|
| + const CFX_WideString& wsFormat,
|
| + IFX_Locale* pLocale);
|
| + bool SetDate(const CFX_Unitime& d);
|
| + bool SetDate(const CFX_WideString& wsDate,
|
| + const CFX_WideString& wsFormat,
|
| + IFX_Locale* pLocale);
|
| + bool SetTime(const CFX_Unitime& t);
|
| + bool SetTime(const CFX_WideString& wsTime,
|
| + const CFX_WideString& wsFormat,
|
| + IFX_Locale* pLocale);
|
| + bool SetDateTime(const CFX_Unitime& dt);
|
| + bool SetDateTime(const CFX_WideString& wsDateTime,
|
| + const CFX_WideString& wsFormat,
|
| + IFX_Locale* pLocale);
|
| bool IsNull() const { return m_dwType == XFA_VT_NULL; }
|
| - FX_BOOL IsEmpty() const { return m_wsValue.IsEmpty(); }
|
| - FX_BOOL IsValid() const { return m_bValid; }
|
| + bool IsEmpty() const { return m_wsValue.IsEmpty(); }
|
| + bool IsValid() const { return m_bValid; }
|
|
|
| protected:
|
| - FX_BOOL ParsePatternValue(const CFX_WideString& wsValue,
|
| - const CFX_WideString& wsPattern,
|
| - IFX_Locale* pLocale);
|
| + bool ParsePatternValue(const CFX_WideString& wsValue,
|
| + const CFX_WideString& wsPattern,
|
| + IFX_Locale* pLocale);
|
| CXFA_LocaleMgr* m_pLocaleMgr;
|
| CFX_WideString m_wsValue;
|
| uint32_t m_dwType;
|
| - FX_BOOL m_bValid;
|
| + bool m_bValid;
|
| };
|
|
|
| #endif // XFA_FXFA_PARSER_XFA_LOCALEVALUE_H_
|
|
|