| Index: xfa/fxfa/parser/xfa_localemgr.h
|
| diff --git a/xfa/fxfa/parser/xfa_localemgr.h b/xfa/fxfa/parser/xfa_localemgr.h
|
| index 7051fc9ac399a3b87493e5793bb9c60745299ac0..ab704b8c4829e1df8034387f26628077f9838be7 100644
|
| --- a/xfa/fxfa/parser/xfa_localemgr.h
|
| +++ b/xfa/fxfa/parser/xfa_localemgr.h
|
| @@ -7,6 +7,9 @@
|
| #ifndef XFA_FXFA_PARSER_XFA_LOCALEMGR_H_
|
| #define XFA_FXFA_PARSER_XFA_LOCALEMGR_H_
|
|
|
| +#include <memory>
|
| +#include <vector>
|
| +
|
| #include "xfa/fgas/localization/fgas_datetime.h"
|
| #include "xfa/fgas/localization/fgas_locale.h"
|
| #include "xfa/fxfa/parser/xfa_localemgr.h"
|
| @@ -36,19 +39,18 @@ class CXFA_LocaleMgr : public IFX_LocaleMgr {
|
| ~CXFA_LocaleMgr() override;
|
|
|
| // IFX_LocaleMgr
|
| - void Release() override;
|
| - uint16_t GetDefLocaleID() override;
|
| + uint16_t GetDefLocaleID() const override;
|
| IFX_Locale* GetDefLocale() override;
|
| - IFX_Locale* GetLocale(uint16_t lcid) override;
|
| + std::unique_ptr<IFX_Locale> GetLocale(uint16_t lcid) override;
|
| IFX_Locale* GetLocaleByName(const CFX_WideString& wsLocaleName) override;
|
|
|
| void SetDefLocale(IFX_Locale* pLocale);
|
| CFX_WideStringC GetConfigLocaleName(CXFA_Node* pConfig);
|
|
|
| protected:
|
| - CFX_ArrayTemplate<IFX_Locale*> m_LocaleArray;
|
| - CFX_ArrayTemplate<IFX_Locale*> m_XMLLocaleArray;
|
| - IFX_Locale* m_pDefLocale;
|
| + std::vector<std::unique_ptr<IFX_Locale>> m_LocaleArray;
|
| + std::vector<std::unique_ptr<IFX_Locale>> m_XMLLocaleArray;
|
| + IFX_Locale* m_pDefLocale; // owned by m_LocaleArray or m_XMLLocaleArray.
|
| CFX_WideString m_wsConfigLocale;
|
| uint16_t m_dwDeflcid;
|
| uint16_t m_dwLocaleFlags;
|
|
|