diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-03 14:17:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-04 08:55:56 +0200 |
| commit | 0fd9b79687a9f58a407da8e46e54637f353e122b (patch) | |
| tree | 8a053b46cd8f29e90756edd9ea2bc1a84666ed8d /shell | |
| parent | 3fc7f4c582c04a11bbd6ebede8e8bdc99f3b2034 (diff) | |
shell,sfx2,sd: inline some use-once typedefs
Change-Id: Ifde52b0d92163f99d399b4a9544a196defad1ba4
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/inc/internal/types.hxx | 10 | ||||
| -rw-r--r-- | shell/source/tools/lngconvex/lngconvex.cxx | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx index 1a6c32dc36fa..bfc0cd94324a 100644 --- a/shell/inc/internal/types.hxx +++ b/shell/inc/internal/types.hxx @@ -33,13 +33,9 @@ typedef std::vector<std::wstring> StringList_t; // XmlTags_t, tags defined with tag name and xml tag. // Contents: Definitions of xml tag used in parser. -typedef std::wstring Name_t; -typedef std::wstring Value_t; -typedef std::wstring Characters_t; - -typedef std::map<Name_t, Value_t> XmlTagAttributes_t; -typedef std::pair<Characters_t, XmlTagAttributes_t> XmlTag_t; -typedef std::map<Name_t, XmlTag_t> XmlTags_t; +typedef std::map<std::wstring, std::wstring> XmlTagAttributes_t; +typedef std::pair<std::wstring, XmlTagAttributes_t> XmlTag_t; +typedef std::map<std::wstring, XmlTag_t> XmlTags_t; const XmlTag_t EMPTY_XML_TAG = std::make_pair(std::wstring(), XmlTagAttributes_t()); diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx index 2a9da14fe9cc..633baf182c0c 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -281,8 +281,6 @@ private: iso_lang_identifier active_iso_lang_; }; -typedef std::map< unsigned short , std::string , std::less< unsigned short > > shortmap; - void add_group_entries( Config& aConfig, const OString& GroupName, @@ -292,7 +290,7 @@ void add_group_entries( aConfig.SetGroup(GroupName); size_t key_count = aConfig.GetKeyCount(); - shortmap map; + std::map< unsigned short , std::string > map; for (size_t i = 0; i < key_count; i++) { |