diff options
| author | weili <weili@chromium.org> | 2016-08-15 12:25:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-15 12:25:29 -0700 |
| commit | 8e557bd9e7c09f9ce75fbea42f826b74d5cdc54b (patch) | |
| tree | 64484433a43f21fa73e89c80eddded27d16a3e48 /xfa/fxfa/parser/xfa_locale.h | |
| parent | 1099b29f5569004f8a83be93dbe0c31a3620a9e5 (diff) | |
| download | pdfium-8e557bd9e7c09f9ce75fbea42f826b74d5cdc54b.tar.xz | |
Clean up XFA locale and locale manager
Return unique_ptr for GetLocale(), directly use destructors
instead of Release() functions, use vectors to manage arrays.
Review-Url: https://codereview.chromium.org/2241863002
Diffstat (limited to 'xfa/fxfa/parser/xfa_locale.h')
| -rw-r--r-- | xfa/fxfa/parser/xfa_locale.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/xfa/fxfa/parser/xfa_locale.h b/xfa/fxfa/parser/xfa_locale.h index 0463a9f9e9..75104b456c 100644 --- a/xfa/fxfa/parser/xfa_locale.h +++ b/xfa/fxfa/parser/xfa_locale.h @@ -15,10 +15,10 @@ class CXFA_XMLLocale : public IFX_Locale { public: explicit CXFA_XMLLocale(std::unique_ptr<CXML_Element> pLocaleData); + ~CXFA_XMLLocale() override; // IFX_Locale - void Release() override; - CFX_WideString GetName() override; + CFX_WideString GetName() const override; void GetNumbericSymbol(FX_LOCALENUMSYMBOL eType, CFX_WideString& wsNumSymbol) const override; @@ -42,8 +42,6 @@ class CXFA_XMLLocale : public IFX_Locale { CFX_WideString& wsPattern) const override; protected: - ~CXFA_XMLLocale() override; - void GetPattern(CXML_Element* pElement, const CFX_ByteStringC& bsTag, const CFX_WideStringC& wsName, @@ -59,10 +57,10 @@ class CXFA_XMLLocale : public IFX_Locale { class CXFA_NodeLocale : public IFX_Locale { public: CXFA_NodeLocale(CXFA_Node* pLocale); + ~CXFA_NodeLocale() override; // IFX_Locale - void Release() override; - CFX_WideString GetName() override; + CFX_WideString GetName() const override; void GetNumbericSymbol(FX_LOCALENUMSYMBOL eType, CFX_WideString& wsNumSymbol) const override; @@ -86,8 +84,6 @@ class CXFA_NodeLocale : public IFX_Locale { CFX_WideString& wsPattern) const override; protected: - ~CXFA_NodeLocale() override; - CXFA_Node* GetNodeByName(CXFA_Node* pParent, const CFX_WideStringC& wsName) const; CFX_WideString GetSymbol(XFA_Element eElement, |